futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into core-updates

Browse Source
This commit is contained in:
Efraim Flashner 2017-10-01 19:59:55 +03:00
commit 64df08f0cf
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
283 changed files with 29398 additions and 4014 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.mailmap
View File

@ -33,7 +33,7 @@ Joshua Grant <tadni@riseup.net> <gzg@riseup.net>
Joshua Grant <tadni@riseup.net> <jgrant@parenthetical.io> Joshua Grant <tadni@riseup.net> <jgrant@parenthetical.io>
Joshua Grant <tadni@riseup.net> <tadnimi@gmail.com> Joshua Grant <tadni@riseup.net> <tadnimi@gmail.com>
Joshua Grant <tadni@riseup.net> <youlysses@riseup.net> Joshua Grant <tadni@riseup.net> <youlysses@riseup.net>
Kei Kebreau <kei@openmailbox.org> Kei Kebreau <kei@openmailbox.org> <kkebreau@posteo.net>
Leo Famulari <leo@famulari.name> <lfamular@gmail.com> Leo Famulari <leo@famulari.name> <lfamular@gmail.com>
Ludovic Courtès <ludo@gnu.org> <ludovic.courtes@inria.fr> Ludovic Courtès <ludo@gnu.org> <ludovic.courtes@inria.fr>
Marek Benc <dusxmt@gmx.com> <merkur32@gmail.com> Marek Benc <dusxmt@gmx.com> <merkur32@gmail.com>

22
Makefile.am
View File

@ -7,6 +7,7 @@
# Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> # Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
# Copyright © 2017 Leo Famulari <leo@famulari.name> # Copyright © 2017 Leo Famulari <leo@famulari.name>
# Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> # Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
# Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
# #
@ -79,6 +80,7 @@ MODULES = \
guix/build-system/dub.scm \ guix/build-system/dub.scm \
guix/build-system/emacs.scm \ guix/build-system/emacs.scm \
guix/build-system/font.scm \ guix/build-system/font.scm \
guix/build-system/meson.scm \
guix/build-system/minify.scm \ guix/build-system/minify.scm \
guix/build-system/asdf.scm \ guix/build-system/asdf.scm \
guix/build-system/glib-or-gtk.scm \ guix/build-system/glib-or-gtk.scm \
@ -106,6 +108,7 @@ MODULES = \
guix/build/cmake-build-system.scm \ guix/build/cmake-build-system.scm \
guix/build/dub-build-system.scm \ guix/build/dub-build-system.scm \
guix/build/emacs-build-system.scm \ guix/build/emacs-build-system.scm \
guix/build/meson-build-system.scm \
guix/build/minify-build-system.scm \ guix/build/minify-build-system.scm \
guix/build/font-build-system.scm \ guix/build/font-build-system.scm \
guix/build/asdf-build-system.scm \ guix/build/asdf-build-system.scm \
@ -141,6 +144,7 @@ MODULES = \
guix/build/make-bootstrap.scm \ guix/build/make-bootstrap.scm \
guix/search-paths.scm \ guix/search-paths.scm \
guix/packages.scm \ guix/packages.scm \
guix/import/print.scm \
guix/import/utils.scm \ guix/import/utils.scm \
guix/import/gnu.scm \ guix/import/gnu.scm \
guix/import/snix.scm \ guix/import/snix.scm \
@ -164,12 +168,14 @@ MODULES = \
guix/scripts/authenticate.scm \ guix/scripts/authenticate.scm \
guix/scripts/refresh.scm \ guix/scripts/refresh.scm \
guix/scripts/system.scm \ guix/scripts/system.scm \
guix/scripts/system/search.scm \
guix/scripts/lint.scm \ guix/scripts/lint.scm \
guix/scripts/challenge.scm \ guix/scripts/challenge.scm \
guix/scripts/import/cran.scm \ guix/scripts/import/cran.scm \
guix/scripts/import/gnu.scm \ guix/scripts/import/gnu.scm \
guix/scripts/import/nix.scm \ guix/scripts/import/nix.scm \
guix/scripts/import/hackage.scm \ guix/scripts/import/hackage.scm \
guix/scripts/import/json.scm \
guix/scripts/import/elpa.scm \ guix/scripts/import/elpa.scm \
guix/scripts/import/texlive.scm \ guix/scripts/import/texlive.scm \
guix/scripts/environment.scm \ guix/scripts/environment.scm \
@ -191,6 +197,7 @@ MODULES += \
guix/import/crate.scm \ guix/import/crate.scm \
guix/import/gem.scm \ guix/import/gem.scm \
guix/import/github.scm \ guix/import/github.scm \
guix/import/gnome.scm \
guix/import/json.scm \ guix/import/json.scm \
guix/import/pypi.scm \ guix/import/pypi.scm \
guix/import/stackage.scm \ guix/import/stackage.scm \
@ -223,8 +230,8 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
# Auxiliary files for packages. # Auxiliary files for packages.
AUX_FILES = \ AUX_FILES = \
gnu/packages/aux-files/emacs/guix-emacs.el \ gnu/packages/aux-files/emacs/guix-emacs.el \
gnu/packages/aux-files/linux-libre/4.12-i686.conf \ gnu/packages/aux-files/linux-libre/4.13-i686.conf \
gnu/packages/aux-files/linux-libre/4.12-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.13-x86_64.conf \
gnu/packages/aux-files/linux-libre/4.9-i686.conf \ gnu/packages/aux-files/linux-libre/4.9-i686.conf \
gnu/packages/aux-files/linux-libre/4.9-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.9-x86_64.conf \
gnu/packages/aux-files/linux-libre/4.4-i686.conf \ gnu/packages/aux-files/linux-libre/4.4-i686.conf \
@ -271,6 +278,7 @@ SCM_TESTS = \
tests/hash.scm \ tests/hash.scm \
tests/pk-crypto.scm \ tests/pk-crypto.scm \
tests/pki.scm \ tests/pki.scm \
tests/print.scm \
tests/sets.scm \ tests/sets.scm \
tests/modules.scm \ tests/modules.scm \
tests/gnu-maintenance.scm \ tests/gnu-maintenance.scm \
@ -312,6 +320,7 @@ SCM_TESTS = \
tests/workers.scm \ tests/workers.scm \
tests/zlib.scm \ tests/zlib.scm \
tests/file-systems.scm \ tests/file-systems.scm \
tests/uuid.scm \
tests/system.scm \ tests/system.scm \
tests/services.scm \ tests/services.scm \
tests/scripts-build.scm \ tests/scripts-build.scm \
@ -702,6 +711,15 @@ hydra-jobs.scm: $(GOBJECTS)
"$(top_srcdir)/build-aux/hydra/gnu-system.scm" > "$@.tmp" "$(top_srcdir)/build-aux/hydra/gnu-system.scm" > "$@.tmp"
$(AM_V_at)mv "$@.tmp" "$@" $(AM_V_at)mv "$@.tmp" "$@"
# Compute the Cuirass jobs and write them in the target file.
cuirass-jobs.scm: $(GOBJECTS)
$(AM_V_at)$(MKDIR_P) "`dirname "$@"`"
$(AM_V_GEN)$(top_builddir)/pre-inst-env "$(GUILE)" \
"$(top_srcdir)/build-aux/hydra/evaluate.scm" \
"$(top_srcdir)/build-aux/cuirass/gnu-system.scm" \
cuirass > "$@.tmp"
$(AM_V_at)mv "$@.tmp" "$@"
.PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version .PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version
.PHONY: assert-no-store-file-names assert-binaries-available .PHONY: assert-no-store-file-names assert-binaries-available
.PHONY: assert-final-inputs-self-contained .PHONY: assert-final-inputs-self-contained

38
README
View File

@ -1,42 +1,42 @@
-*- mode: org -*- -*- mode: org -*-
[[http://www.gnu.org/software/guix/][GNU Guix]] (IPA: /ɡiːks/) is a purely functional package manager, and [[https://www.gnu.org/software/guix/][GNU Guix]] (IPA: /ɡiːks/) is a purely functional package manager, and
associated free software distribution, for the [[http://www.gnu.org/gnu/gnu.html][GNU system]]. In addition associated free software distribution, for the [[https://www.gnu.org/gnu/gnu.html][GNU system]]. In addition
to standard package management features, Guix supports transactional to standard package management features, Guix supports transactional
upgrades and roll-backs, unprivileged package management, per-user upgrades and roll-backs, unprivileged package management, per-user
profiles, and garbage collection. profiles, and garbage collection.
It provides [[http://www.gnu.org/software/guile/][Guile]] Scheme APIs, including a high-level embedded It provides [[https://www.gnu.org/software/guile/][Guile]] Scheme APIs, including a high-level embedded
domain-specific languages (EDSLs) to describe how packages are to be domain-specific languages (EDSLs) to describe how packages are to be
built and composed. built and composed.
A user-land free software distribution for GNU/Linux comes as part of A user-land free software distribution for GNU/Linux comes as part of
Guix. Guix.
Guix is based on the [[http://nixos.org/nix/][Nix]] package manager. Guix is based on the [[https://nixos.org/nix/][Nix]] package manager.
* Requirements * Requirements
GNU Guix currently depends on the following packages: GNU Guix currently depends on the following packages:
- [[http://gnu.org/software/guile/][GNU Guile 2.2.x or 2.0.x]], version 2.0.9 or later - [[https://gnu.org/software/guile/][GNU Guile 2.2.x or 2.0.x]], version 2.0.9 or later
- [[http://gnupg.org/][GNU libgcrypt]] - [[https://gnupg.org/][GNU libgcrypt]]
- [[http://www.gnu.org/software/make/][GNU Make]] - [[https://www.gnu.org/software/make/][GNU Make]]
- optionally [[http://savannah.nongnu.org/projects/guile-json/][Guile-JSON]], for the 'guix import pypi' command - optionally [[https://savannah.nongnu.org/projects/guile-json/][Guile-JSON]], for the 'guix import pypi' command
- optionally [[http://www.gnutls.org][GnuTLS]] compiled with guile support enabled, for HTTPS support - optionally [[https://www.gnutls.org][GnuTLS]] compiled with guile support enabled, for HTTPS support
in the 'guix download' command. Note that 'guix import pypi' requires in the 'guix download' command. Note that 'guix import pypi' requires
this functionality. this functionality.
Unless `--disable-daemon' was passed, the following packages are needed: Unless `--disable-daemon' was passed, the following packages are needed:
- [[http://sqlite.org/][SQLite 3]] - [[https://sqlite.org/][SQLite 3]]
- [[http://www.bzip.org][libbz2]] - [[http://www.bzip.org][libbz2]]
- [[http://gcc.gnu.org][GCC's g++]] - [[https://gcc.gnu.org][GCC's g++]]
When `--disable-daemon' was passed, you instead need the following: When `--disable-daemon' was passed, you instead need the following:
- [[http://nixos.org/nix/][Nix]] - [[https://nixos.org/nix/][Nix]]
* Installation * Installation
@ -44,7 +44,7 @@ See the manual for the installation instructions, either by running
info -f doc/guix.info "Installation" info -f doc/guix.info "Installation"
or by checking the [[http://www.gnu.org/software/guix/manual/guix.html#Installation][web copy of the manual]]. or by checking the [[https://www.gnu.org/software/guix/manual/guix.html#Installation][web copy of the manual]].
For information on installation from a Git checkout, please see the section For information on installation from a Git checkout, please see the section
"Building from Git" in the manual. "Building from Git" in the manual.
@ -109,7 +109,7 @@ Join #guix on irc.freenode.net.
* Guix & Nix * Guix & Nix
GNU Guix is based on [[http://nixos.org/nix/][the Nix package manager]]. It implements the same GNU Guix is based on [[https://nixos.org/nix/][the Nix package manager]]. It implements the same
package deployment paradigm, and in fact it reuses some of its code. package deployment paradigm, and in fact it reuses some of its code.
Yet, different engineering decisions were made for Guix, as described Yet, different engineering decisions were made for Guix, as described
below. below.
@ -132,7 +132,7 @@ the store. Guix produces such derivations, which are then interpreted
by the daemon to perform the build. Thus, Guix derivations can use by the daemon to perform the build. Thus, Guix derivations can use
derivations produced by Nix (and vice versa). derivations produced by Nix (and vice versa).
With Nix and the [[http://nixos.org/nixpkgs][Nixpkgs]] distribution, package composition happens at With Nix and the [[https://nixos.org/nixpkgs][Nixpkgs]] distribution, package composition happens at
the Nix language level, but builders are usually written in Bash. the Nix language level, but builders are usually written in Bash.
Conversely, Guix encourages the use of Scheme for both package Conversely, Guix encourages the use of Scheme for both package
composition and builders. Likewise, the core functionality of Nix is composition and builders. Likewise, the core functionality of Nix is
@ -141,13 +141,13 @@ but exposes all the API as Scheme.
* Related software * Related software
- [[http://nixos.org][Nix, Nixpkgs, and NixOS]], functional package manager and associated - [[https://nixos.org][Nix, Nixpkgs, and NixOS]], functional package manager and associated
software distribution, are the inspiration of Guix software distribution, are the inspiration of Guix
- [[http://www.gnu.org/software/stow/][GNU Stow]] builds around the idea of one directory per prefix, and a - [[https://www.gnu.org/software/stow/][GNU Stow]] builds around the idea of one directory per prefix, and a
symlink tree to create user environments symlink tree to create user environments
- [[http://www.pvv.ntnu.no/~arnej/store/storedoc_6.html][STORE]] shares the same idea - [[https://www.pvv.ntnu.no/~arnej/store/storedoc_6.html][STORE]] shares the same idea
- [[https://live.gnome.org/OSTree/][GNOME's OSTree]] allows bootable system images to be built from a - [[https://live.gnome.org/OSTree/][GNOME's OSTree]] allows bootable system images to be built from a
specified set of packages specified set of packages
- The [[http://www.gnu.org/s/gsrc/][GNU Source Release Collection]] (GSRC) is a user-land software - The [[https://www.gnu.org/s/gsrc/][GNU Source Release Collection]] (GSRC) is a user-land software
distribution; unlike Guix, it relies on core tools available on the distribution; unlike Guix, it relies on core tools available on the
host system host system

3
build-aux/compile-all.scm
View File

@ -27,7 +27,8 @@
;; FIXME: 'format' is missing because it reports "non-literal format ;; FIXME: 'format' is missing because it reports "non-literal format
;; strings" due to the fact that we use 'G_' instead of '_'. We'll need ;; strings" due to the fact that we use 'G_' instead of '_'. We'll need
;; help from Guile to solve this. ;; help from Guile to solve this.
'(unsupported-warning unbound-variable arity-mismatch)) '(unsupported-warning unbound-variable arity-mismatch
macro-use-before-definition)) ;new in 2.2
(define host (getenv "host")) (define host (getenv "host"))

47
build-aux/cuirass/gnu-system.scm Normal file
View File

@ -0,0 +1,47 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; 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/>.
;;;
;;; This file defines build jobs for the Cuirass continuation integration
;;; tool.
;;;
(include-from-path "build-aux/hydra/gnu-system.scm")
(use-modules ((guix licenses)
#:select (license? license-name license-uri license-comment)))
(define (cuirass-jobs store arguments)
"Return Cuirass jobs."
(map hydra-job->cuirass-job (hydra-jobs store arguments)))
(define (hydra-job->cuirass-job hydra-job)
(let ((name (car hydra-job))
(job ((cdr hydra-job))))
(lambda _ (acons #:job-name (symbol->string name)
(map symbol-alist-entry->keyword-alist-entry job)))))
(define (symbol-alist-entry->keyword-alist-entry entry)
(cons (symbol->keyword (car entry)) (entry->sexp-entry (cdr entry))))
(define (entry->sexp-entry o)
(match o
((? license?) `((name . (license-name o))
(uri . ,(license-uri o))
(comment . ,(license-comment o))))
(_ o)))

13
build-aux/hydra/evaluate.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -70,7 +71,7 @@ Otherwise return THING."
;; Without further ado... ;; Without further ado...
(match (command-line) (match (command-line)
((command file) ((command file cuirass? ...)
;; Load FILE, a Scheme file that defines Hydra jobs. ;; Load FILE, a Scheme file that defines Hydra jobs.
(let ((port (current-output-port))) (let ((port (current-output-port)))
(save-module-excursion (save-module-excursion
@ -96,7 +97,11 @@ Otherwise return THING."
;; Call the entry point of FILE and print the resulting job sexp. ;; Call the entry point of FILE and print the resulting job sexp.
(pretty-print (pretty-print
(match ((module-ref %user-module 'hydra-jobs) store '()) (match ((module-ref %user-module
(if (equal? cuirass? "cuirass")
'cuirass-jobs
'hydra-jobs))
store '())
(((names . thunks) ...) (((names . thunks) ...)
(map (lambda (job thunk) (map (lambda (job thunk)
(format (current-error-port) "evaluating '~a'... " job) (format (current-error-port) "evaluating '~a'... " job)
@ -107,8 +112,8 @@ Otherwise return THING."
names thunks))) names thunks)))
port)))) port))))
((command _ ...) ((command _ ...)
(format (current-error-port) "Usage: ~a FILE (format (current-error-port) "Usage: ~a FILE [cuirass]
Evaluate the Hydra jobs defined in FILE.~%" Evaluate the Hydra or Cuirass jobs defined in FILE.~%"
command) command)
(exit 1))) (exit 1)))

19
build-aux/hydra/gnu-system.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; 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 © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -270,6 +271,8 @@ valid."
(define subset (define subset
(match (assoc-ref arguments 'subset) (match (assoc-ref arguments 'subset)
("core" 'core) ; only build core packages ("core" 'core) ; only build core packages
("hello" 'hello) ; only build hello
(((? string?) (? string?) ...) 'list) ; only build selected list of packages
(_ 'all))) ; build everything (_ 'all))) ; build everything
(define (cross-jobs system) (define (cross-jobs system)
@ -340,6 +343,22 @@ valid."
package system)) package system))
%core-packages) %core-packages)
(cross-jobs system))) (cross-jobs system)))
((hello)
;; Build hello package only.
(if (string=? system (%current-system))
(let ((hello (specification->package "hello")))
(list (package-job store (job-name hello) hello system)))
'()))
((list)
;; Build selected list of packages only.
(if (string=? system (%current-system))
(let* ((names (assoc-ref arguments 'subset))
(packages (map specification->package names)))
(map (lambda (package)
(package-job store (job-name package)
package system))
packages))
'()))
(else (else
(error "unknown subset" subset)))) (error "unknown subset" subset))))
%hydra-supported-systems))) %hydra-supported-systems)))

2
configure.ac
View File

@ -52,7 +52,7 @@ AC_MSG_CHECKING([for the store directory])
AC_MSG_RESULT([$storedir]) AC_MSG_RESULT([$storedir])
AC_ARG_ENABLE([daemon], AC_ARG_ENABLE([daemon],
[AS_HELP_STRING([--disable-daemon], [build the Nix daemon (C++)])], [AS_HELP_STRING([--disable-daemon], [do not build the Nix daemon (C++)])],
[guix_build_daemon="$enableval"], [guix_build_daemon="$enableval"],
[guix_build_daemon="yes"]) [guix_build_daemon="yes"])

32
doc/contributing.texi
View File

@ -298,11 +298,7 @@ This mailing list is backed by a Debbugs instance accessible at
of submissions. Each message sent to that mailing list gets a new of submissions. Each message sent to that mailing list gets a new
tracking number assigned; people can then follow up on the submission by tracking number assigned; people can then follow up on the submission by
sending email to @code{@var{NNN}@@debbugs.gnu.org}, where @var{NNN} is sending email to @code{@var{NNN}@@debbugs.gnu.org}, where @var{NNN} is
the tracking number. When sending a patch series, please first send one the tracking number (@pxref{Sending a Patch Series}).
message to @email{guix-patches@@gnu.org}, and then send subsequent
patches to @email{@var{NNN}@@debbugs.gnu.org} to make sure they are kept
together. See @uref{https://debbugs.gnu.org/Advanced.html, the Debbugs
documentation}, for more information.
Please write commit logs in the ChangeLog format (@pxref{Change Logs,,, Please write commit logs in the ChangeLog format (@pxref{Change Logs,,,
standards, GNU Coding Standards}); you can check the commit history for standards, GNU Coding Standards}); you can check the commit history for
@ -434,7 +430,25 @@ Please follow our code formatting rules, possibly running the
When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as
a subject. You may use your email client or the @command{git a subject. You may use your email client or the @command{git
send-email} command. We prefer to get patches in plain text messages, send-email} command (@pxref{Sending a Patch Series}). We prefer to get
either inline or as MIME attachments. You are advised to pay attention if patches in plain text messages, either inline or as MIME attachments.
your email client changes anything like line breaks or indentation which You are advised to pay attention if your email client changes anything
could potentially break the patches. like line breaks or indentation which could potentially break the
patches.
When a bug is resolved, please close the thread by sending an email to
@email{@var{NNN}-done@@debbugs.gnu.org}.
@unnumberedsubsec Sending a Patch Series
@anchor{Sending a Patch Series}
@cindex patch series
@cindex @code{git send-email}
@cindex @code{git-send-email}
When sending a patch series (e.g., using @code{git send-email}), please
first send one message to @email{guix-patches@@gnu.org}, and then send
subsequent patches to @email{@var{NNN}@@debbugs.gnu.org} to make sure
they are kept together. See
@uref{https://debbugs.gnu.org/Advanced.html, the Debbugs documentation}
for more information.
@c Debbugs bug: https://debbugs.gnu.org/db/15/15361.html

346
doc/guix.texi
View File

@ -27,7 +27,7 @@ Copyright @copyright{} 2016 Chris Marusich@*
Copyright @copyright{} 2016, 2017 Efraim Flashner@* Copyright @copyright{} 2016, 2017 Efraim Flashner@*
Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016 John Darrington@*
Copyright @copyright{} 2016 ng0@* Copyright @copyright{} 2016 ng0@*
Copyright @copyright{} 2016 Jan Nieuwenhuizen@* Copyright @copyright{} 2016, 2017 Jan Nieuwenhuizen@*
Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Julien Lepiller@*
Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016 Alex ter Weele@*
Copyright @copyright{} 2017 Clément Lassieur@* Copyright @copyright{} 2017 Clément Lassieur@*
@ -38,7 +38,9 @@ Copyright @copyright{} 2017 Thomas Danckaert@*
Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 humanitiesNerd@*
Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017 Christopher Allan Webber@*
Copyright @copyright{} 2017 Marius Bakke@* Copyright @copyright{} 2017 Marius Bakke@*
Copyright @copyright{} 2017 Hartmut Goebel Copyright @copyright{} 2017 Hartmut Goebel@*
Copyright @copyright{} 2017 Maxim Cournoyer@*
Copyright @copyright{} 2017 Tobias Geerinckx-Rice
Permission is granted to copy, distribute and/or modify this document Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or under the terms of the GNU Free Documentation License, Version 1.3 or
@ -2141,6 +2143,8 @@ your system has unpatched security vulnerabilities.
@cindex security @cindex security
@cindex digital signatures @cindex digital signatures
@cindex substitutes, authorization thereof @cindex substitutes, authorization thereof
@cindex access control list (ACL), for substitutes
@cindex ACL (access control list), for substitutes
To allow Guix to download substitutes from @code{hydra.gnu.org} or a To allow Guix to download substitutes from @code{hydra.gnu.org} or a
mirror thereof, you mirror thereof, you
must add its public key to the access control list (ACL) of archive must add its public key to the access control list (ACL) of archive
@ -2189,9 +2193,29 @@ The following files would be downloaded:
This indicates that substitutes from @code{hydra.gnu.org} are usable and This indicates that substitutes from @code{hydra.gnu.org} are usable and
will be downloaded, when possible, for future builds. will be downloaded, when possible, for future builds.
Guix ignores substitutes that are not signed, or that are not signed by Guix detects and raises an error when attempting to use a substitute
one of the keys listed in the ACL. It also detects and raises an error that has been tampered with. Likewise, it ignores substitutes that are
when attempting to use a substitute that has been tampered with. not signed, or that are not signed by one of the keys listed in the ACL.
There is one exception though: if an unauthorized server provides
substitutes that are @emph{bit-for-bit identical} to those provided by
an authorized server, then the unauthorized server becomes eligible for
downloads. For example, assume we have chosen two substitute servers
with this option:
@example
--substitute-urls="https://a.example.org https://b.example.org"
@end example
@noindent
@cindex reproducible builds
If the ACL contains only the key for @code{b.example.org}, and if
@code{a.example.org} happens to serve the @emph{exact same} substitutes,
then Guix will download substitutes from @code{a.example.org} because it
comes first in the list and can be considered a mirror of
@code{b.example.org}. In practice, independent build machines usually
produce the same binaries, thanks to bit-reproducible builds (see
below).
@vindex http_proxy @vindex http_proxy
Substitutes are downloaded over HTTP or HTTPS. Substitutes are downloaded over HTTP or HTTPS.
@ -3787,6 +3811,61 @@ need to be copied into place. It copies font files to standard
locations in the output directory. locations in the output directory.
@end defvr @end defvr
@defvr {Scheme Variable} meson-build-system
This variable is exported by @code{(guix build-system meson)}. It
implements the build procedure for packages that use
@url{http://mesonbuild.com, Meson} as their build system.
It adds both Meson and @uref{https://ninja-build.org/, Ninja} to the set
of inputs, and they can be changed with the parameters @code{#:meson}
and @code{#:ninja} if needed. The default Meson is
@code{meson-for-build}, which is special because it doesn't clear the
@code{RUNPATH} of binaries and libraries when they are installed.
This build system is an extension of @var{gnu-build-system}, but with the
following phases changed to some specific for Meson:
@table @code
@item configure
The phase runs @code{meson} with the flags specified in
@code{#:configure-flags}. The flag @code{--build-type} is always set to
@code{plain} unless something else is specified in @code{#:build-type}.
@item build
The phase runs @code{ninja} to build the package in parallel by default, but
this can be changed with @code{#:parallel-build?}.
@item check
The phase runs @code{ninja} with the target specified in @code{#:test-target},
which is @code{"test"} by default.
@item install
The phase runs @code{ninja install} and can not be changed.
@end table
Apart from that, the build system also adds the following phases:
@table @code
@item fix-runpath
This phase tries to locate the local directories in the package being build,
which has libraries that some of the binaries need. If any are found, they will
be added to the programs @code{RUNPATH}. It is needed because
@code{meson-for-build} keeps the @code{RUNPATH} of binaries and libraries from
when they are build, but often that is not the @code{RUNPATH} we want.
Therefor it is also shrinked to the minimum needed by the program.
@item glib-or-gtk-wrap
This phase is the phase provided by @code{glib-or-gtk-build-system}, and it
is not enabled by default. It can be enabled with @code{#:glib-or-gtk?}.
@item glib-or-gtk-compile-schemas
This phase is the phase provided by @code{glib-or-gtk-build-system}, and it
is not enabled by default. It can be enabled with @code{#:glib-or-gtk?}.
@end table
@end defvr
Lastly, for packages that do not need anything as sophisticated, a Lastly, for packages that do not need anything as sophisticated, a
``trivial'' build system is provided. It is trivial in the sense that ``trivial'' build system is provided. It is trivial in the sense that
it provides basically no support: it does not pull any implicit inputs, it provides basically no support: it does not pull any implicit inputs,
@ -5820,6 +5899,56 @@ CTAN while fetching the sources from the directory
guix import texlive --archive=generic ifxetex guix import texlive --archive=generic ifxetex
@end example @end example
@item json
@cindex JSON, import
Import package metadata from a local JSON file@footnote{This
functionality requires Guile-JSON to be installed.
@xref{Requirements}.}. Consider the following example package
definition in JSON format:
@example
@{
"name": "hello",
"version": "2.10",
"source": "mirror://gnu/hello/hello-2.10.tar.gz",
"build-system": "gnu",
"home-page": "https://www.gnu.org/software/hello/",
"synopsis": "Hello, GNU world: An example GNU package",
"description": "GNU Hello prints a greeting.",
"license": "GPL-3.0+",
"native-inputs": ["gcc@@6"]
@}
@end example
The field names are the same as for the @code{<package>} record
(@xref{Defining Packages}). References to other packages are provided
as JSON lists of quoted package specification strings such as
@code{guile} or @code{guile@@2.0}.
The importer also supports a more explicit source definition using the
common fields for @code{<origin>} records:
@example
@{
@dots{}
"source": @{
"method": "url-fetch",
"uri": "mirror://gnu/hello/hello-2.10.tar.gz",
"sha256": @{
"base32": "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"
@}
@}
@dots{}
@}
@end example
The command below reads metadata from the JSON file @code{hello.json}
and outputs a package expression:
@example
guix import json hello.json
@end example
@item nix @item nix
Import metadata from a local copy of the source of the Import metadata from a local copy of the source of the
@uref{http://nixos.org/nixpkgs/, Nixpkgs distribution}@footnote{This @uref{http://nixos.org/nixpkgs/, Nixpkgs distribution}@footnote{This
@ -6381,10 +6510,10 @@ Use substitute information from @var{urls}.
Sort lines according to @var{key}, one of the following options: Sort lines according to @var{key}, one of the following options:
@table @code @table @code
@item closure
the total size of the item's closure (the default);
@item self @item self
the size of each item. the size of each item (the default);
@item closure
the total size of the item's closure.
@end table @end table
@item --map-file=@var{file} @item --map-file=@var{file}
@ -7851,7 +7980,12 @@ Once you are done partitioning the target hard disk drive, you have to
create a file system on the relevant partition(s)@footnote{Currently create a file system on the relevant partition(s)@footnote{Currently
GuixSD only supports ext4 and btrfs file systems. In particular, code GuixSD only supports ext4 and btrfs file systems. In particular, code
that reads partition UUIDs and labels only works for these file system that reads partition UUIDs and labels only works for these file system
types.}. types.}. For the ESP, if you have one and assuming it is
@file{/dev/sda2}, run:
@example
mkfs.fat -F32 /dev/sda2
@end example
Preferably, assign partitions a label so that you can easily and Preferably, assign partitions a label so that you can easily and
reliably refer to them in @code{file-system} declarations (@pxref{File reliably refer to them in @code{file-system} declarations (@pxref{File
@ -8162,8 +8296,9 @@ environment variable---in addition to the per-user profiles
provides all the tools one would expect for basic user and administrator provides all the tools one would expect for basic user and administrator
tasks---including the GNU Core Utilities, the GNU Networking Utilities, tasks---including the GNU Core Utilities, the GNU Networking Utilities,
the GNU Zile lightweight text editor, @command{find}, @command{grep}, the GNU Zile lightweight text editor, @command{find}, @command{grep},
etc. The example above adds tcpdump to those, taken from the @code{(gnu etc. The example above adds GNU@tie{}Screen and OpenSSH to those,
packages admin)} module (@pxref{Package Modules}). The taken from the @code{(gnu packages screen)} and @code{(gnu packages ssh)}
modules (@pxref{Package Modules}). The
@code{(list package output)} syntax can be used to add a specific output @code{(list package output)} syntax can be used to add a specific output
of a package: of a package:
@ -9879,7 +10014,7 @@ with the default settings, for commonly encountered log files.
(operating-system (operating-system
;; @dots{} ;; @dots{}
(services (cons* (mcron-service) (services (cons* (service mcron-service-type)
(service rottlog-service-type) (service rottlog-service-type)
%base-services))) %base-services)))
@end lisp @end lisp
@ -10010,6 +10145,9 @@ This is the service type for the
@uref{https://wiki.gnome.org/Projects/NetworkManager, NetworkManager} @uref{https://wiki.gnome.org/Projects/NetworkManager, NetworkManager}
service. The value for this service type is a service. The value for this service type is a
@code{network-manager-configuration} record. @code{network-manager-configuration} record.
This service is part of @code{%desktop-services} (@pxref{Desktop
Services}).
@end defvr @end defvr
@deftp {Data Type} network-manager-configuration @deftp {Data Type} network-manager-configuration
@ -10037,6 +10175,11 @@ then update @code{resolv.conf} to point to the local nameserver.
NetworkManager will not modify @code{resolv.conf}. NetworkManager will not modify @code{resolv.conf}.
@end table @end table
@item @code{vpn-plugins} (default: @code{'()})
This is the list of available plugins for virtual private networks
(VPNs). An example of this is the @code{network-manager-openvpn}
package, which allows NetworkManager to manage VPNs @i{via} OpenVPN.
@end table @end table
@end deftp @end deftp
@ -10242,6 +10385,75 @@ In addition, @var{extra-settings} specifies a string to append to the
configuration file. configuration file.
@end deffn @end deffn
The @code{(gnu services rsync)} module provides the following services:
You might want an rsync daemon if you have files that you want available
so anyone (or just yourself) can download existing files or upload new
files.
@deffn {Scheme Variable} rsync-service-type
This is the type for the @uref{https://rsync.samba.org, rsync} rsync daemon,
@command{rsync-configuration} record as in this example:
@example
(service rsync-service-type)
@end example
See below for details about @code{rsync-configuration}.
@end deffn
@deftp {Data Type} rsync-configuration
Data type representing the configuration for @code{rsync-service}.
@table @asis
@item @code{package} (default: @var{rsync})
@code{rsync} package to use.
@item @code{port-number} (default: @code{873})
TCP port on which @command{rsync} listens for incoming connections. If port
is less than @code{1024} @command{rsync} needs to be started as the
@code{root} user and group.
@item @code{pid-file} (default: @code{"/var/run/rsyncd/rsyncd.pid"})
Name of the file where @command{rsync} writes its PID.
@item @code{lock-file} (default: @code{"/var/run/rsyncd/rsyncd.lock"})
Name of the file where @command{rsync} writes its lock file.
@item @code{log-file} (default: @code{"/var/log/rsyncd.log"})
Name of the file where @command{rsync} writes its log file.
@item @code{use-chroot?} (default: @var{#t})
Whether to use chroot for @command{rsync} shared directory.
@item @code{share-path} (default: @file{/srv/rsync})
Location of the @command{rsync} shared directory.
@item @code{share-comment} (default: @code{"Rsync share"})
Comment of the @command{rsync} shared directory.
@item @code{read-only?} (default: @var{#f})
Read-write permissions to shared directory.
@item @code{timeout} (default: @code{300})
I/O timeout in seconds.
@item @code{user} (default: @var{"root"})
Owner of the @code{rsync} process.
@item @code{group} (default: @var{"root"})
Group of the @code{rsync} process.
@item @code{uid} (default: @var{"rsyncd"})
User name or user ID that file transfers to and from that module should take
place as when the daemon was run as @code{root}.
@item @code{gid} (default: @var{"rsyncd"})
Group name or group ID that will be used when accessing the module.
@end table
@end deftp
Furthermore, @code{(gnu services ssh)} provides the following services. Furthermore, @code{(gnu services ssh)} provides the following services.
@cindex SSH @cindex SSH
@cindex SSH server @cindex SSH server
@ -11573,7 +11785,7 @@ adds or adjusts services for a typical ``desktop'' setup.
In particular, it adds a graphical login manager (@pxref{X Window, In particular, it adds a graphical login manager (@pxref{X Window,
@code{slim-service}}), screen lockers, a network management tool @code{slim-service}}), screen lockers, a network management tool
(@pxref{Networking Services, @code{wicd-service}}), energy and color (@pxref{Networking Services, @code{network-manager-service-type}}), energy and color
management services, the @code{elogind} login and seat manager, the management services, the @code{elogind} login and seat manager, the
Polkit privilege service, the GeoClue location service, the Polkit privilege service, the GeoClue location service, the
AccountsService daemon that allows authorized users change system AccountsService daemon that allows authorized users change system
@ -11654,7 +11866,7 @@ and policy files. For example, to allow avahi-daemon to use the system bus,
@deffn {Scheme Procedure} elogind-service [#:config @var{config}] @deffn {Scheme Procedure} elogind-service [#:config @var{config}]
Return a service that runs the @code{elogind} login and Return a service that runs the @code{elogind} login and
seat management daemon. @uref{https://github.com/andywingo/elogind, seat management daemon. @uref{https://github.com/elogind/elogind,
Elogind} exposes a D-Bus interface that can be used to know which users Elogind} exposes a D-Bus interface that can be used to know which users
are logged in, know what kind of sessions they have open, suspend the are logged in, know what kind of sessions they have open, suspend the
system, inhibit system suspend, reboot the system, and other tasks. system, inhibit system suspend, reboot the system, and other tasks.
@ -11815,9 +12027,13 @@ location databases. See
web site} for more information. web site} for more information.
@end deffn @end deffn
@deffn {Scheme Procedure} bluetooth-service [#:bluez @var{bluez}] @deffn {Scheme Procedure} bluetooth-service [#:bluez @var{bluez}] @
Return a service that runs the @command{bluetoothd} daemon, which manages [@w{#:auto-enable? #f}]
all the Bluetooth devices and provides a number of D-Bus interfaces. Return a service that runs the @command{bluetoothd} daemon, which
manages all the Bluetooth devices and provides a number of D-Bus
interfaces. When AUTO-ENABLE? is true, the bluetooth controller is
powered automatically at boot, which can be useful when using a
bluetooth keyboard or mouse.
Users need to be in the @code{lp} group to access the D-Bus service. Users need to be in the @code{lp} group to access the D-Bus service.
@end deffn @end deffn
@ -14028,7 +14244,7 @@ A simple example configuration is given below.
@example @example
(service nginx-service-type (service nginx-service-type
(nginx-configuration (nginx-configuration
(server-list (server-blocks
(list (nginx-server-configuration (list (nginx-server-configuration
(server-name '("www.example.com")) (server-name '("www.example.com"))
(root "/srv/http/www.example.com") (root "/srv/http/www.example.com")
@ -14047,7 +14263,8 @@ blocks, as in this example:
(https-port #f) (https-port #f)
(ssl-certificate #f) (ssl-certificate #f)
(ssl-certificate-key #f) (ssl-certificate-key #f)
(root "/srv/http/extra-website")))) (root "/srv/http/extra-website")
(try-files (list "$uri" "$uri/index.html")))))
@end example @end example
@end deffn @end deffn
@ -14076,7 +14293,7 @@ The directory to which NGinx will write log files.
The directory in which NGinx will create a pid file, and write temporary The directory in which NGinx will create a pid file, and write temporary
files. files.
@item @code{server-list} (default: @code{'()}) @item @code{server-blocks} (default: @code{'()})
A list of @dfn{server blocks} to create in the generated configuration A list of @dfn{server blocks} to create in the generated configuration
file, the elements should be of type file, the elements should be of type
@code{<nginx-server-configuration>}. @code{<nginx-server-configuration>}.
@ -14087,7 +14304,7 @@ HTTPS.
@example @example
(service nginx-service-type (service nginx-service-type
(nginx-configuration (nginx-configuration
(server-list (server-blocks
(list (nginx-server-configuration (list (nginx-server-configuration
(server-name '("www.example.com")) (server-name '("www.example.com"))
(root "/srv/http/www.example.com") (root "/srv/http/www.example.com")
@ -14096,12 +14313,12 @@ HTTPS.
(ssl-certificate-key #f)))))) (ssl-certificate-key #f))))))
@end example @end example
@item @code{upstream-list} (default: @code{'()}) @item @code{upstream-blocks} (default: @code{'()})
A list of @dfn{upstream blocks} to create in the generated configuration A list of @dfn{upstream blocks} to create in the generated configuration
file, the elements should be of type file, the elements should be of type
@code{<nginx-upstream-configuration>}. @code{<nginx-upstream-configuration>}.
Configuring upstreams through the @code{upstream-list} can be useful Configuring upstreams through the @code{upstream-blocks} can be useful
when combined with @code{locations} in the when combined with @code{locations} in the
@code{<nginx-server-configuration>} records. The following example @code{<nginx-server-configuration>} records. The following example
creates a server configuration with one location configuration, that creates a server configuration with one location configuration, that
@ -14112,7 +14329,7 @@ requests with two servers.
(service (service
nginx-service-type nginx-service-type
(nginx-configuration (nginx-configuration
(server-list (server-blocks
(list (nginx-server-configuration (list (nginx-server-configuration
(server-name '("www.example.com")) (server-name '("www.example.com"))
(root "/srv/http/www.example.com") (root "/srv/http/www.example.com")
@ -14124,20 +14341,19 @@ requests with two servers.
(nginx-location-configuration (nginx-location-configuration
(uri "/path1") (uri "/path1")
(body '("proxy_pass http://server-proxy;")))))))) (body '("proxy_pass http://server-proxy;"))))))))
(upstream-list (upstream-blocks
(list (nginx-upstream-configuration (list (nginx-upstream-configuration
(name "server-proxy") (name "server-proxy")
(servers (list "server1.example.com" (servers (list "server1.example.com"
"server2.example.com"))))))) "server2.example.com")))))))
@end example @end example
@item @code{config-file} (default: @code{#f}) @item @code{file} (default: @code{#f})
If the @var{config-file} is provided, this will be used, rather than If a configuration @var{file} is provided, this will be used, rather than
generating a configuration file from the provided @code{log-directory}, generating a configuration file from the provided @code{log-directory},
@code{run-directory}, @code{server-list} and @code{upstream-list}. For @code{run-directory}, @code{server-blocks} and @code{upstream-blocks}. For
proper operation, these arguments should match what is in proper operation, these arguments should match what is in @var{file} to ensure
@var{config-file} to ensure that the directories are created when the that the directories are created when the service is activated.
service is activated.
This can be useful if you have an existing configuration file, or it's This can be useful if you have an existing configuration file, or it's
not possible to do what is required through the other parts of the not possible to do what is required through the other parts of the
@ -14179,6 +14395,10 @@ server block.
Index files to look for when clients ask for a directory. If it cannot be found, Index files to look for when clients ask for a directory. If it cannot be found,
Nginx will send the list of files in the directory. Nginx will send the list of files in the directory.
@item @code{try-files} (default: @code{'()})
A list of files whose existence is checked in the specified order.
@code{nginx} will use the first file it finds to process the request.
@item @code{ssl-certificate} (default: @code{"/etc/nginx/cert.pem"}) @item @code{ssl-certificate} (default: @code{"/etc/nginx/cert.pem"})
Where to find the certificate for secure connections. Set it to @code{#f} if Where to find the certificate for secure connections. Set it to @code{#f} if
you don't have a certificate or you don't want to use HTTPS. you don't have a certificate or you don't want to use HTTPS.
@ -15202,20 +15422,13 @@ packages, as prescribed in the @file{gnu-system.scm} example spec:
(let ((spec #~((#:name . "guix") (let ((spec #~((#:name . "guix")
(#:url . "git://git.savannah.gnu.org/guix.git") (#:url . "git://git.savannah.gnu.org/guix.git")
(#:load-path . ".") (#:load-path . ".")
(#:file . "build-aux/cuirass/gnu-system.scm")
;; Here we must provide an absolute file name. (#:proc . cuirass-jobs)
;; We take jobs from one of the examples provided
;; by Cuirass.
(#:file . #$(file-append
cuirass
"/tests/gnu-system.scm"))
(#:proc . hydra-jobs)
(#:arguments (subset . "hello")) (#:arguments (subset . "hello"))
(#:branch . "master")))) (#:branch . "master"))))
(service cuirass-service-type (service cuirass-service-type
(cuirass-configuration (cuirass-configuration
(specifications #~(list #$spec))))) (specifications #~(list '#$spec)))))
@end example @end example
While information related to build jobs is located directly in the While information related to build jobs is located directly in the
@ -15246,9 +15459,13 @@ Cuirass jobs.
Location of sqlite database which contains the build results and previously Location of sqlite database which contains the build results and previously
added specifications. added specifications.
@item @code{port} (default: @code{8080}) @item @code{port} (default: @code{8081})
Port number used by the HTTP server. Port number used by the HTTP server.
@item --listen=@var{host}
Listen on the network interface for @var{host}. The default is to
accept connections from localhost.
@item @code{specifications} (default: @code{#~'()}) @item @code{specifications} (default: @code{#~'()})
A gexp (@pxref{G-Expressions}) that evaluates to a list of specifications, A gexp (@pxref{G-Expressions}) that evaluates to a list of specifications,
where a specification is an association list where a specification is an association list
@ -15844,9 +16061,6 @@ The directory to scan for music files.
@item @code{playlist-dir} (default: @code{"~/.mpd/playlists"}) @item @code{playlist-dir} (default: @code{"~/.mpd/playlists"})
The directory to store playlists. The directory to store playlists.
@item @code{pid-file} (default: @code{"/var/run/mpd.pid"})
The file mpd wil store its PID. This must be an absolute path.
@item @code{port} (default: @code{"6600"}) @item @code{port} (default: @code{"6600"})
The port to run mpd on. The port to run mpd on.
@ -17363,6 +17577,42 @@ operating system is instantiated. Currently the following values are
supported: supported:
@table @code @table @code
@item search
Display available service type definitions that match the given regular
expressions, sorted by relevance:
@example
$ guix system search console font
name: console-fonts
location: gnu/services/base.scm:729:2
extends: shepherd-root
description: Install the given fonts on the specified ttys (fonts are
+ per virtual console on GNU/Linux). The value of this service is a list
+ of tty/font pairs like:
+
+ '(("tty1" . "LatGrkCyr-8x16"))
relevance: 20
name: mingetty
location: gnu/services/base.scm:1048:2
extends: shepherd-root
description: Provide console login using the `mingetty' program.
relevance: 2
name: login
location: gnu/services/base.scm:775:2
extends: pam
description: Provide a console log-in service as specified by its
+ configuration value, a `login-configuration' object.
relevance: 2
@dots{}
@end example
As for @command{guix package --search}, the result is written in
@code{recutils} format, which makes it easy to filter the output
(@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual}).
@item reconfigure @item reconfigure
Build the operating system described in @var{file}, activate it, and Build the operating system described in @var{file}, activate it, and
switch to it@footnote{This action (and the related actions switch to it@footnote{This action (and the related actions
@ -17992,6 +18242,12 @@ Udev extensions are composed into a list of rules, but the udev service
value is itself a @code{<udev-configuration>} record. So here, we value is itself a @code{<udev-configuration>} record. So here, we
extend that record by appending the list of rules it contains to the extend that record by appending the list of rules it contains to the
list of contributed rules. list of contributed rules.
@item description
This is a string giving an overview of the service type. The string can
contain Texinfo markup (@pxref{Overview,,, texinfo, GNU Texinfo}). The
@command{guix system search} command searches these strings and displays
them (@pxref{Invoking guix system}).
@end table @end table
There can be only one instance of an extensible service type such as There can be only one instance of an extensible service type such as

4
gnu/bootloader/grub.scm
View File

@ -30,7 +30,7 @@
#:use-module (gnu artwork) #:use-module (gnu artwork)
#:use-module (gnu system) #:use-module (gnu system)
#:use-module (gnu bootloader) #:use-module (gnu bootloader)
#:use-module (gnu system file-systems) #:use-module (gnu system uuid)
#:autoload (gnu packages bootloaders) (grub) #:autoload (gnu packages bootloaders) (grub)
#:autoload (gnu packages compression) (gzip) #:autoload (gnu packages compression) (gzip)
#:autoload (gnu packages gtk) (guile-cairo guile-rsvg) #:autoload (gnu packages gtk) (guile-cairo guile-rsvg)
@ -300,7 +300,7 @@ code."
(match device (match device
;; Preferably refer to DEVICE by its UUID or label. This is more ;; Preferably refer to DEVICE by its UUID or label. This is more
;; efficient and less ambiguous, see <http://bugs.gnu.org/22281>. ;; efficient and less ambiguous, see <http://bugs.gnu.org/22281>.
((? bytevector? uuid) ((? uuid? uuid)
(format #f "search --fs-uuid --set ~a" (format #f "search --fs-uuid --set ~a"
(uuid->string device))) (uuid->string device)))
((? string? label) ((? string? label)

130
gnu/build/file-systems.scm
View File

@ -19,6 +19,7 @@
;;; 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 build file-systems) (define-module (gnu build file-systems)
#:use-module (gnu system uuid)
#:use-module (guix build utils) #:use-module (guix build utils)
#:use-module (guix build bournish) #:use-module (guix build bournish)
#:use-module (guix build syscalls) #:use-module (guix build syscalls)
@ -26,8 +27,6 @@
#:use-module (rnrs bytevectors) #:use-module (rnrs bytevectors)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 rdelim) #:use-module (ice-9 rdelim)
#:use-module (ice-9 format)
#:use-module (ice-9 regex)
#:use-module (system foreign) #:use-module (system foreign)
#:autoload (system repl repl) (start-repl) #:autoload (system repl repl) (start-repl)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
@ -41,15 +40,6 @@
find-partition-by-luks-uuid find-partition-by-luks-uuid
canonicalize-device-spec canonicalize-device-spec
uuid->string
string->uuid
string->iso9660-uuid
string->ext2-uuid
string->ext3-uuid
string->ext4-uuid
string->btrfs-uuid
iso9660-uuid->string
bind-mount bind-mount
mount-flags->bit-mask mount-flags->bit-mask
@ -95,20 +85,6 @@ takes a bytevector and returns #t when it's a valid superblock."
(and (magic? block) (and (magic? block)
block))))))))) block)))))))))
(define (sub-bytevector bv start size)
"Return a copy of the SIZE bytes of BV starting from offset START."
(let ((result (make-bytevector size)))
(bytevector-copy! bv start result 0 size)
result))
(define (latin1->string bv terminator)
"Return a string of BV, a latin1 bytevector, or #f. TERMINATOR is a predicate
that takes a number and returns #t when a termination character is found."
(let ((bytes (take-while (negate terminator) (bytevector->u8-list bv))))
(if (null? bytes)
#f
(list->string (map integer->char bytes)))))
(define null-terminated-latin1->string (define null-terminated-latin1->string
(cut latin1->string <> zero?)) (cut latin1->string <> zero?))
@ -196,10 +172,6 @@ if DEVICE does not contain a btrfs file system."
;; <http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-107.pdf>. ;; <http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-107.pdf>.
(define-syntax %fat32-endianness
;; Endianness of fat file systems.
(identifier-syntax (endianness little)))
(define (fat32-superblock? sblock) (define (fat32-superblock? sblock)
"Return #t when SBLOCK is a fat32 superblock." "Return #t when SBLOCK is a fat32 superblock."
(bytevector=? (sub-bytevector sblock 82 8) (bytevector=? (sub-bytevector sblock 82 8)
@ -214,12 +186,6 @@ if DEVICE does not contain a btrfs file system."
"Return the Volume ID of a fat superblock SBLOCK as a 4-byte bytevector." "Return the Volume ID of a fat superblock SBLOCK as a 4-byte bytevector."
(sub-bytevector sblock 67 4)) (sub-bytevector sblock 67 4))
(define (fat32-uuid->string uuid)
"Convert fat32 UUID, a 4-byte bytevector, to its string representation."
(let ((high (bytevector-uint-ref uuid 0 %fat32-endianness 2))
(low (bytevector-uint-ref uuid 2 %fat32-endianness 2)))
(format #f "~:@(~x-~x~)" low high)))
(define (fat32-superblock-volume-name sblock) (define (fat32-superblock-volume-name sblock)
"Return the volume name of SBLOCK as a string of at most 11 characters, or "Return the volume name of SBLOCK as a string of at most 11 characters, or
#f if SBLOCK has no volume name. The volume name is a latin1 string. #f if SBLOCK has no volume name. The volume name is a latin1 string.
@ -241,27 +207,6 @@ Trailing spaces are trimmed."
;; <http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-119.pdf>. ;; <http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-119.pdf>.
(define %iso9660-uuid-rx
;; Y m d H M S ss
(make-regexp "^([[:digit:]]{4})-([[:digit:]]{2})-([[:digit:]]{2})-([[:digit:]]{2})-([[:digit:]]{2})-([[:digit:]]{2})-([[:digit:]]{2})$"))
(define (string->iso9660-uuid str)
"Parse STR as a ISO9660 UUID (which is really a timestamp - see /dev/disk/by-uuid).
Return its contents as a 16-byte bytevector. Return #f if STR is not a valid
ISO9660 UUID representation."
(and=> (regexp-exec %iso9660-uuid-rx str)
(lambda (match)
(letrec-syntax ((match-numerals
(syntax-rules ()
((_ index (name rest ...) body)
(let ((name (match:substring match index)))
(match-numerals (+ 1 index) (rest ...) body)))
((_ index () body)
body))))
(match-numerals 1 (year month day hour minute second hundredths)
(string->utf8 (string-append year month day
hour minute second hundredths)))))))
(define (iso9660-superblock? sblock) (define (iso9660-superblock? sblock)
"Return #t when SBLOCK is an iso9660 volume descriptor." "Return #t when SBLOCK is an iso9660 volume descriptor."
(bytevector=? (sub-bytevector sblock 1 6) (bytevector=? (sub-bytevector sblock 1 6)
@ -308,20 +253,6 @@ SBLOCK as a bytevector. If that's not set, returns the creation time."
modification-time))) modification-time)))
(sub-bytevector time 0 16))) ; strips GMT offset. (sub-bytevector time 0 16))) ; strips GMT offset.
(define (iso9660-uuid->string uuid)
"Given an UUID bytevector, return its timestamp string."
(define (digits->string bytes)
(latin1->string bytes (lambda (c) #f)))
(let* ((year (sub-bytevector uuid 0 4))
(month (sub-bytevector uuid 4 2))
(day (sub-bytevector uuid 6 2))
(hour (sub-bytevector uuid 8 2))
(minute (sub-bytevector uuid 10 2))
(second (sub-bytevector uuid 12 2))
(hundredths (sub-bytevector uuid 14 2))
(parts (list year month day hour minute second hundredths)))
(string-append (string-join (map digits->string parts) "-"))))
(define (iso9660-superblock-volume-name sblock) (define (iso9660-superblock-volume-name sblock)
"Return the volume name of SBLOCK as a string. The volume name is an ASCII "Return the volume name of SBLOCK as a string. The volume name is an ASCII
string. Trailing spaces are trimmed." string. Trailing spaces are trimmed."
@ -508,65 +439,6 @@ were found."
(define find-partition-by-luks-uuid (define find-partition-by-luks-uuid
(find-partition luks-partition-uuid-predicate)) (find-partition luks-partition-uuid-predicate))
;;;
;;; UUIDs.
;;;
(define-syntax %network-byte-order
(identifier-syntax (endianness big)))
(define (uuid->string uuid)
"Convert UUID, a 16-byte bytevector, to its string representation, something
like \"6b700d61-5550-48a1-874c-a3d86998990e\"."
;; See <https://tools.ietf.org/html/rfc4122>.
(let ((time-low (bytevector-uint-ref uuid 0 %network-byte-order 4))
(time-mid (bytevector-uint-ref uuid 4 %network-byte-order 2))
(time-hi (bytevector-uint-ref uuid 6 %network-byte-order 2))
(clock-seq (bytevector-uint-ref uuid 8 %network-byte-order 2))
(node (bytevector-uint-ref uuid 10 %network-byte-order 6)))
(format #f "~8,'0x-~4,'0x-~4,'0x-~4,'0x-~12,'0x"
time-low time-mid time-hi clock-seq node)))
(define %uuid-rx
;; The regexp of a UUID.
(make-regexp "^([[:xdigit:]]{8})-([[:xdigit:]]{4})-([[:xdigit:]]{4})-([[:xdigit:]]{4})-([[:xdigit:]]{12})$"))
(define (string->uuid str)
"Parse STR as a DCE UUID (see <https://tools.ietf.org/html/rfc4122>) and
return its contents as a 16-byte bytevector. Return #f if STR is not a valid
UUID representation."
(and=> (regexp-exec %uuid-rx str)
(lambda (match)
(letrec-syntax ((hex->number
(syntax-rules ()
((_ index)
(string->number (match:substring match index)
16))))
(put!
(syntax-rules ()
((_ bv index (number len) rest ...)
(begin
(bytevector-uint-set! bv index number
(endianness big) len)
(put! bv (+ index len) rest ...)))
((_ bv index)
bv))))
(let ((time-low (hex->number 1))
(time-mid (hex->number 2))
(time-hi (hex->number 3))
(clock-seq (hex->number 4))
(node (hex->number 5))
(uuid (make-bytevector 16)))
(put! uuid 0
(time-low 4) (time-mid 2) (time-hi 2)
(clock-seq 2) (node 6)))))))
(define string->ext2-uuid string->uuid)
(define string->ext3-uuid string->uuid)
(define string->ext4-uuid string->uuid)
(define string->btrfs-uuid string->uuid)
(define* (canonicalize-device-spec spec #:optional (title 'any)) (define* (canonicalize-device-spec spec #:optional (title 'any))
"Return the device name corresponding to SPEC. TITLE is a symbol, one of "Return the device name corresponding to SPEC. TITLE is a symbol, one of

7
gnu/build/marionette.scm
View File

@ -165,13 +165,14 @@ QEMU monitor and to the guest's backdoor REPL."
(newline repl) (newline repl)
(read repl)))) (read repl))))
(define* (wait-for-file file marionette #:key (timeout 10)) (define* (wait-for-file file marionette
"Wait until FILE exists in MARIONETTE; 'read' its content and return it. If #:key (timeout 10) (read 'read))
"Wait until FILE exists in MARIONETTE; READ its content and return it. If
FILE has not shown up after TIMEOUT seconds, raise an error." FILE has not shown up after TIMEOUT seconds, raise an error."
(match (marionette-eval (match (marionette-eval
`(let loop ((i ,timeout)) `(let loop ((i ,timeout))
(cond ((file-exists? ,file) (cond ((file-exists? ,file)
(cons 'success (call-with-input-file ,file read))) (cons 'success (call-with-input-file ,file ,read)))
((> i 0) ((> i 0)
(sleep 1) (sleep 1)
(loop (- i 1))) (loop (- i 1)))

66
gnu/build/vm.scm
View File

@ -26,7 +26,7 @@
#:use-module (guix build syscalls) #:use-module (guix build syscalls)
#:use-module (gnu build linux-boot) #:use-module (gnu build linux-boot)
#:use-module (gnu build install) #:use-module (gnu build install)
#:use-module (gnu build file-systems) #:use-module (gnu system uuid)
#:use-module (guix records) #:use-module (guix records)
#:use-module ((guix combinators) #:select (fold2)) #:use-module ((guix combinators) #:select (fold2))
#:use-module (ice-9 format) #:use-module (ice-9 format)
@ -163,6 +163,7 @@ the #:references-graphs parameter of 'derivation'."
(size partition-size) (size partition-size)
(file-system partition-file-system (default "ext4")) (file-system partition-file-system (default "ext4"))
(label partition-label (default #f)) (label partition-label (default #f))
(uuid partition-uuid (default #f))
(flags partition-flags (default '())) (flags partition-flags (default '()))
(initializer partition-initializer (default (const #t)))) (initializer partition-initializer (default (const #t))))
@ -236,22 +237,26 @@ actual /dev name based on DEVICE."
(define MS_BIND 4096) ; <sys/mounts.h> again! (define MS_BIND 4096) ; <sys/mounts.h> again!
(define* (create-ext-file-system partition type (define* (create-ext-file-system partition type
#:key label) #:key label uuid)
"Create an ext-family filesystem of TYPE on PARTITION. If LABEL is true, "Create an ext-family filesystem of TYPE on PARTITION. If LABEL is true,
use that as the volume name." use that as the volume name. If UUID is true, use it as the partition UUID."
(format #t "creating ~a partition...\n" type) (format #t "creating ~a partition...\n" type)
(unless (zero? (apply system* (string-append "mkfs." type) (unless (zero? (apply system* (string-append "mkfs." type)
"-F" partition "-F" partition
(if label `(,@(if label
`("-L" ,label) `("-L" ,label)
'()))) '())
,@(if uuid
`("-U" ,(uuid->string uuid))
'()))))
(error "failed to create partition"))) (error "failed to create partition")))
(define* (create-fat-file-system partition (define* (create-fat-file-system partition
#:key label) #:key label uuid)
"Create a FAT filesystem on PARTITION. The number of File Allocation Tables "Create a FAT filesystem on PARTITION. The number of File Allocation Tables
will be determined based on filesystem size. If LABEL is true, use that as the will be determined based on filesystem size. If LABEL is true, use that as the
volume name." volume name."
;; FIXME: UUID is ignored!
(format #t "creating FAT partition...\n") (format #t "creating FAT partition...\n")
(unless (zero? (apply system* "mkfs.fat" partition (unless (zero? (apply system* "mkfs.fat" partition
(if label (if label
@ -260,13 +265,13 @@ volume name."
(error "failed to create FAT partition"))) (error "failed to create FAT partition")))
(define* (format-partition partition type (define* (format-partition partition type
#:key label) #:key label uuid)
"Create a file system TYPE on PARTITION. If LABEL is true, use that as the "Create a file system TYPE on PARTITION. If LABEL is true, use that as the
volume name." volume name."
(cond ((string-prefix? "ext" type) (cond ((string-prefix? "ext" type)
(create-ext-file-system partition type #:label label)) (create-ext-file-system partition type #:label label #:uuid uuid))
((or (string-prefix? "fat" type) (string= "vfat" type)) ((or (string-prefix? "fat" type) (string= "vfat" type))
(create-fat-file-system partition #:label label)) (create-fat-file-system partition #:label label #:uuid uuid))
(else (error "Unsupported file system.")))) (else (error "Unsupported file system."))))
(define (initialize-partition partition) (define (initialize-partition partition)
@ -275,7 +280,8 @@ it, run its initializer, and unmount it."
(let ((target "/fs")) (let ((target "/fs"))
(format-partition (partition-device partition) (format-partition (partition-device partition)
(partition-file-system partition) (partition-file-system partition)
#:label (partition-label partition)) #:label (partition-label partition)
#:uuid (partition-uuid partition))
(mkdir-p target) (mkdir-p target)
(mount (partition-device partition) target (mount (partition-device partition) target
(partition-file-system partition)) (partition-file-system partition))
@ -366,32 +372,40 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation."
(error "failed to create GRUB EFI image")))) (error "failed to create GRUB EFI image"))))
(define* (make-iso9660-image grub config-file os-drv target (define* (make-iso9660-image grub config-file os-drv target
#:key (volume-id "GuixSD_image") (volume-uuid #f)) #:key (volume-id "GuixSD_image") (volume-uuid #f)
register-closures? (closures '()))
"Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as "Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as
GRUB configuration and OS-DRV as the stuff in it." GRUB configuration and OS-DRV as the stuff in it."
(let ((grub-mkrescue (string-append grub "/bin/grub-mkrescue"))) (let ((grub-mkrescue (string-append grub "/bin/grub-mkrescue"))
(target-store (string-append "/tmp/root" (%store-directory))))
(mkdir-p "/tmp/root/var/run") (mkdir-p "/tmp/root/var/run")
(mkdir-p "/tmp/root/run") (mkdir-p "/tmp/root/run")
(mkdir-p "/tmp/root/mnt")
(mkdir-p target-store)
(mount (%store-directory) target-store "" MS_BIND)
(when register-closures?
(display "registering closures...\n")
(for-each (lambda (closure)
(register-closure
"/tmp/root"
(string-append "/xchg/" closure)
;; XXX: Using deduplication causes cross device link errors.
#:deduplicate? #f))
closures))
(unless (zero? (apply system* (unless (zero? (apply system*
`(,grub-mkrescue "-o" ,target `(,grub-mkrescue "-o" ,target
,(string-append "boot/grub/grub.cfg=" config-file) ,(string-append "boot/grub/grub.cfg=" config-file)
,(string-append "gnu/store=" os-drv "/..") ,(string-append "gnu/store=" os-drv "/..")
"var=/tmp/root/var" "var=/tmp/root/var"
"run=/tmp/root/run" "run=/tmp/root/run"
;; /mnt is used as part of the installation
;; process, as the mount point for the target
;; filesystem, so create it.
"mnt=/tmp/root/mnt"
"--" "--"
;; Store two copies of the headers.
;; The resulting ISO-9660 image has a DOS MBR and
;; one protective partition (with type 0xCD).
;; Because GuixSD only uses actual partitions
;; rather than what /proc/partitions returns, work
;; around it by storing the primary volume
;; descriptor twice, once where it should be and
;; once in the partition.
;; Allegedly, otherwise, many other GNU tools
;; (automounters etc) would also be confused by
;; the extra partition so it makes sense to
;; store two copies in any case.
"-boot_image" "any" "partition_offset=16"
"-volid" ,(string-upcase volume-id) "-volid" ,(string-upcase volume-id)
,@(if volume-uuid ,@(if volume-uuid
`("-volume_date" "uuid" `("-volume_date" "uuid"

55
gnu/local.mk
View File

@ -4,7 +4,7 @@
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> # Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
# Copyright © 2013, 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> # Copyright © 2013, 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
# Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> # Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
# Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org> # Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
# Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org> # Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org>
# Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org> # Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
# Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> # Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
@ -88,6 +88,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/chez.scm \ %D%/packages/chez.scm \
%D%/packages/ci.scm \ %D%/packages/ci.scm \
%D%/packages/cmake.scm \ %D%/packages/cmake.scm \
%D%/packages/cobol.scm \
%D%/packages/code.scm \ %D%/packages/code.scm \
%D%/packages/commencement.scm \ %D%/packages/commencement.scm \
%D%/packages/compression.scm \ %D%/packages/compression.scm \
@ -139,6 +140,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/enlightenment.scm \ %D%/packages/enlightenment.scm \
%D%/packages/entr.scm \ %D%/packages/entr.scm \
%D%/packages/erlang.scm \ %D%/packages/erlang.scm \
%D%/packages/fabric-management.scm \
%D%/packages/fcitx.scm \ %D%/packages/fcitx.scm \
%D%/packages/figlet.scm \ %D%/packages/figlet.scm \
%D%/packages/file.scm \ %D%/packages/file.scm \
@ -363,6 +365,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/shells.scm \ %D%/packages/shells.scm \
%D%/packages/shellutils.scm \ %D%/packages/shellutils.scm \
%D%/packages/simh.scm \ %D%/packages/simh.scm \
%D%/packages/simulation.scm \
%D%/packages/skarnet.scm \ %D%/packages/skarnet.scm \
%D%/packages/skribilo.scm \ %D%/packages/skribilo.scm \
%D%/packages/slang.scm \ %D%/packages/slang.scm \
@ -449,6 +452,7 @@ GNU_SYSTEM_MODULES = \
%D%/services/shepherd.scm \ %D%/services/shepherd.scm \
%D%/services/herd.scm \ %D%/services/herd.scm \
%D%/services/pm.scm \ %D%/services/pm.scm \
%D%/services/rsync.scm \
%D%/services/sddm.scm \ %D%/services/sddm.scm \
%D%/services/spice.scm \ %D%/services/spice.scm \
%D%/services/ssh.scm \ %D%/services/ssh.scm \
@ -468,6 +472,7 @@ GNU_SYSTEM_MODULES = \
%D%/system/nss.scm \ %D%/system/nss.scm \
%D%/system/pam.scm \ %D%/system/pam.scm \
%D%/system/shadow.scm \ %D%/system/shadow.scm \
%D%/system/uuid.scm \
%D%/system/vm.scm \ %D%/system/vm.scm \
\ \
%D%/build/activation.scm \ %D%/build/activation.scm \
@ -487,12 +492,14 @@ GNU_SYSTEM_MODULES = \
%D%/tests/audio.scm \ %D%/tests/audio.scm \
%D%/tests/base.scm \ %D%/tests/base.scm \
%D%/tests/databases.scm \ %D%/tests/databases.scm \
%D%/tests/desktop.scm \
%D%/tests/dict.scm \ %D%/tests/dict.scm \
%D%/tests/nfs.scm \ %D%/tests/nfs.scm \
%D%/tests/install.scm \ %D%/tests/install.scm \
%D%/tests/mail.scm \ %D%/tests/mail.scm \
%D%/tests/messaging.scm \ %D%/tests/messaging.scm \
%D%/tests/networking.scm \ %D%/tests/networking.scm \
%D%/tests/rsync.scm \
%D%/tests/ssh.scm \ %D%/tests/ssh.scm \
%D%/tests/virtualization.scm \ %D%/tests/virtualization.scm \
%D%/tests/web.scm %D%/tests/web.scm
@ -534,9 +541,9 @@ dist_patch_DATA = \
%D%/packages/patches/binutils-ld-new-dtags.patch \ %D%/packages/patches/binutils-ld-new-dtags.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/blast+-fix-makefile.patch \ %D%/packages/patches/blast+-fix-makefile.patch \
%D%/packages/patches/bluez-CVE-2017-1000250.patch \
%D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/cairo-CVE-2016-9082.patch \ %D%/packages/patches/cairo-CVE-2016-9082.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/calibre-use-packaged-feedparser.patch \ %D%/packages/patches/calibre-use-packaged-feedparser.patch \
%D%/packages/patches/catdoc-CVE-2017-11110.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \
@ -566,7 +573,6 @@ dist_patch_DATA = \
%D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \
%D%/packages/patches/crda-optional-gcrypt.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \
%D%/packages/patches/crossmap-allow-system-pysam.patch \ %D%/packages/patches/crossmap-allow-system-pysam.patch \
%D%/packages/patches/csound-header-ordering.patch \
%D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/clucene-contribs-lib.patch \
%D%/packages/patches/curl-bounds-check.patch \ %D%/packages/patches/curl-bounds-check.patch \
%D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cursynth-wave-rand.patch \
@ -581,7 +587,6 @@ dist_patch_DATA = \
%D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/doc++-segfault-fix.patch \
%D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/doxygen-test.patch \
%D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \
%D%/packages/patches/e2fsprogs-32bit-quota-warnings.patch \
%D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \
%D%/packages/patches/elixir-disable-failing-tests.patch \ %D%/packages/patches/elixir-disable-failing-tests.patch \
%D%/packages/patches/einstein-build.patch \ %D%/packages/patches/einstein-build.patch \
@ -602,13 +607,15 @@ dist_patch_DATA = \
%D%/packages/patches/fasthenry-spFactor.patch \ %D%/packages/patches/fasthenry-spFactor.patch \
%D%/packages/patches/fcgi-2.4.0-gcc44-fixes.patch \ %D%/packages/patches/fcgi-2.4.0-gcc44-fixes.patch \
%D%/packages/patches/fcgi-2.4.0-poll.patch \ %D%/packages/patches/fcgi-2.4.0-poll.patch \
%D%/packages/patches/file-CVE-2017-1000249.patch \
%D%/packages/patches/findutils-localstatedir.patch \ %D%/packages/patches/findutils-localstatedir.patch \
%D%/packages/patches/findutils-gnulib-multi-core.patch \ %D%/packages/patches/findutils-gnulib-multi-core.patch \
%D%/packages/patches/findutils-test-xargs.patch \ %D%/packages/patches/findutils-test-xargs.patch \
%D%/packages/patches/flint-ldconfig.patch \ %D%/packages/patches/flint-ldconfig.patch \
%D%/packages/patches/fltk-shared-lib-defines.patch \ %D%/packages/patches/fltk-shared-lib-defines.patch \
%D%/packages/patches/fltk-xfont-on-demand.patch \ %D%/packages/patches/fltk-xfont-on-demand.patch \
%D%/packages/patches/fontforge-svg-modtime.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
%D%/packages/patches/freeimage-CVE-2015-0852.patch \ %D%/packages/patches/freeimage-CVE-2015-0852.patch \
%D%/packages/patches/freeimage-CVE-2016-5684.patch \ %D%/packages/patches/freeimage-CVE-2016-5684.patch \
%D%/packages/patches/freeimage-fix-build-with-gcc-5.patch \ %D%/packages/patches/freeimage-fix-build-with-gcc-5.patch \
@ -630,7 +637,6 @@ dist_patch_DATA = \
%D%/packages/patches/gcr-disable-failing-tests.patch \ %D%/packages/patches/gcr-disable-failing-tests.patch \
%D%/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch \ %D%/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch \
%D%/packages/patches/gdk-pixbuf-list-dir.patch \ %D%/packages/patches/gdk-pixbuf-list-dir.patch \
%D%/packages/patches/gd-CVE-2017-7890.patch \
%D%/packages/patches/gd-fix-gd2-read-test.patch \ %D%/packages/patches/gd-fix-gd2-read-test.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gd-freetype-test-failure.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \
@ -673,9 +679,14 @@ dist_patch_DATA = \
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
%D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-cc.patch \
%D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \
%D%/packages/patches/graphicsmagick-CVE-2017-11403+CVE-2017-14103.patch \
%D%/packages/patches/graphicsmagick-CVE-2017-12935.patch \ %D%/packages/patches/graphicsmagick-CVE-2017-12935.patch \
%D%/packages/patches/graphicsmagick-CVE-2017-12936.patch \ %D%/packages/patches/graphicsmagick-CVE-2017-12936.patch \
%D%/packages/patches/graphicsmagick-CVE-2017-12937.patch \ %D%/packages/patches/graphicsmagick-CVE-2017-12937.patch \
%D%/packages/patches/graphicsmagick-CVE-2017-13775.patch \
%D%/packages/patches/graphicsmagick-CVE-2017-13776+CVE-2017-13777.patch \
%D%/packages/patches/graphicsmagick-CVE-2017-14042.patch \
%D%/packages/patches/graphicsmagick-CVE-2017-14165.patch \
%D%/packages/patches/graphite2-ffloat-store.patch \ %D%/packages/patches/graphite2-ffloat-store.patch \
%D%/packages/patches/grep-timing-sensitive-test.patch \ %D%/packages/patches/grep-timing-sensitive-test.patch \
%D%/packages/patches/groff-source-date-epoch.patch \ %D%/packages/patches/groff-source-date-epoch.patch \
@ -711,6 +722,7 @@ dist_patch_DATA = \
%D%/packages/patches/heimdal-CVE-2017-11103.patch \ %D%/packages/patches/heimdal-CVE-2017-11103.patch \
%D%/packages/patches/hmmer-remove-cpu-specificity.patch \ %D%/packages/patches/hmmer-remove-cpu-specificity.patch \
%D%/packages/patches/higan-remove-march-native-flag.patch \ %D%/packages/patches/higan-remove-march-native-flag.patch \
%D%/packages/patches/httpd-CVE-2017-9798.patch \
%D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hubbub-sort-entities.patch \
%D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \
%D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \
@ -750,6 +762,7 @@ dist_patch_DATA = \
%D%/packages/patches/liba52-link-with-libm.patch \ %D%/packages/patches/liba52-link-with-libm.patch \
%D%/packages/patches/liba52-set-soname.patch \ %D%/packages/patches/liba52-set-soname.patch \
%D%/packages/patches/liba52-use-mtune-not-mcpu.patch \ %D%/packages/patches/liba52-use-mtune-not-mcpu.patch \
%D%/packages/patches/libarchive-CVE-2017-14166.patch \
%D%/packages/patches/libbase-fix-includes.patch \ %D%/packages/patches/libbase-fix-includes.patch \
%D%/packages/patches/libbase-use-own-logging.patch \ %D%/packages/patches/libbase-use-own-logging.patch \
%D%/packages/patches/libbonobo-activation-test-race.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \
@ -795,14 +808,12 @@ dist_patch_DATA = \
%D%/packages/patches/libtirpc-CVE-2017-8779.patch \ %D%/packages/patches/libtirpc-CVE-2017-8779.patch \
%D%/packages/patches/libtorrent-rasterbar-boost-compat.patch \ %D%/packages/patches/libtorrent-rasterbar-boost-compat.patch \
%D%/packages/patches/libtool-skip-tests2.patch \ %D%/packages/patches/libtool-skip-tests2.patch \
%D%/packages/patches/libunwind-CVE-2015-3239.patch \
%D%/packages/patches/libunistring-gnulib-multi-core.patch \ %D%/packages/patches/libunistring-gnulib-multi-core.patch \
%D%/packages/patches/libusb-0.1-disable-tests.patch \ %D%/packages/patches/libusb-0.1-disable-tests.patch \
%D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \
%D%/packages/patches/libxcb-python-3.5-compat.patch \ %D%/packages/patches/libxcb-python-3.5-compat.patch \
%D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxslt-generated-ids.patch \
%D%/packages/patches/libxt-guix-search-paths.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \
%D%/packages/patches/libzip-CVE-2017-12858.patch \
%D%/packages/patches/lierolibre-check-unaligned-access.patch \ %D%/packages/patches/lierolibre-check-unaligned-access.patch \
%D%/packages/patches/lierolibre-is-free-software.patch \ %D%/packages/patches/lierolibre-is-free-software.patch \
%D%/packages/patches/lierolibre-newer-libconfig.patch \ %D%/packages/patches/lierolibre-newer-libconfig.patch \
@ -835,9 +846,8 @@ dist_patch_DATA = \
%D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \
%D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \
%D%/packages/patches/mesa-wayland-egl-symbols-check-mips.patch \ %D%/packages/patches/mesa-wayland-egl-symbols-check-mips.patch \
%D%/packages/patches/metabat-remove-compilation-date.patch \ %D%/packages/patches/meson-for-build-rpath.patch \
%D%/packages/patches/metabat-fix-compilation.patch \ %D%/packages/patches/metabat-fix-compilation.patch \
%D%/packages/patches/metabat-fix-boost-issue.patch \
%D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \
%D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch \ %D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch \
%D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \
@ -848,7 +858,6 @@ dist_patch_DATA = \
%D%/packages/patches/mozjs38-shell-version.patch \ %D%/packages/patches/mozjs38-shell-version.patch \
%D%/packages/patches/mozjs38-tracelogger.patch \ %D%/packages/patches/mozjs38-tracelogger.patch \
%D%/packages/patches/mozjs38-version-detection.patch \ %D%/packages/patches/mozjs38-version-detection.patch \
%D%/packages/patches/multiqc-fix-git-subprocess-error.patch \
%D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mumps-build-parallelism.patch \
%D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch \ %D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch \
%D%/packages/patches/mupen64plus-ui-console-notice.patch \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \
@ -862,9 +871,9 @@ dist_patch_DATA = \
%D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-y2038-tests.patch \
%D%/packages/patches/netsurf-longer-test-timeout.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \
%D%/packages/patches/newsbeuter-CVE-2017-12904.patch \ %D%/packages/patches/newsbeuter-CVE-2017-12904.patch \
%D%/packages/patches/newsbeuter-CVE-2017-14500.patch \
%D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \
%D%/packages/patches/ninja-zero-mtime.patch \ %D%/packages/patches/ninja-zero-mtime.patch \
%D%/packages/patches/node-9077.patch \
%D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \
%D%/packages/patches/nss-pkgconfig.patch \ %D%/packages/patches/nss-pkgconfig.patch \
%D%/packages/patches/nvi-assume-preserve-path.patch \ %D%/packages/patches/nvi-assume-preserve-path.patch \
@ -875,11 +884,18 @@ dist_patch_DATA = \
%D%/packages/patches/ocaml-CVE-2015-8869.patch \ %D%/packages/patches/ocaml-CVE-2015-8869.patch \
%D%/packages/patches/ocaml-Add-a-.file-directive.patch \ %D%/packages/patches/ocaml-Add-a-.file-directive.patch \
%D%/packages/patches/ocaml-findlib-make-install.patch \ %D%/packages/patches/ocaml-findlib-make-install.patch \
%D%/packages/patches/ocaml-graph-honor-source-date-epoch.patch \
%D%/packages/patches/omake-fix-non-determinism.patch \ %D%/packages/patches/omake-fix-non-determinism.patch \
%D%/packages/patches/ola-readdir-r.patch \ %D%/packages/patches/ola-readdir-r.patch \
%D%/packages/patches/openscenegraph-ffmpeg3.patch \ %D%/packages/patches/openscenegraph-ffmpeg3.patch \
%D%/packages/patches/openexr-missing-samples.patch \ %D%/packages/patches/openexr-missing-samples.patch \
%D%/packages/patches/openfoam-4.1-cleanup.patch \
%D%/packages/patches/openjpeg-CVE-2017-12982.patch \ %D%/packages/patches/openjpeg-CVE-2017-12982.patch \
%D%/packages/patches/openjpeg-CVE-2017-14040.patch \
%D%/packages/patches/openjpeg-CVE-2017-14041.patch \
%D%/packages/patches/openjpeg-CVE-2017-14151.patch \
%D%/packages/patches/openjpeg-CVE-2017-14152.patch \
%D%/packages/patches/openjpeg-CVE-2017-14164.patch \
%D%/packages/patches/openldap-CVE-2017-9287.patch \ %D%/packages/patches/openldap-CVE-2017-9287.patch \
%D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openocd-nrf52.patch \
%D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-runpath.patch \
@ -953,6 +969,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-genshi-fix-tests-on-python-3.5.patch \ %D%/packages/patches/python-genshi-fix-tests-on-python-3.5.patch \
%D%/packages/patches/python-genshi-isstring-helper.patch \ %D%/packages/patches/python-genshi-isstring-helper.patch \
%D%/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch \ %D%/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch \
%D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
%D%/packages/patches/python-parse-too-many-fields.patch \ %D%/packages/patches/python-parse-too-many-fields.patch \
%D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
%D%/packages/patches/python-statsmodels-fix-tests.patch \ %D%/packages/patches/python-statsmodels-fix-tests.patch \
@ -967,18 +984,8 @@ dist_patch_DATA = \
%D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
%D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
%D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \
%D%/packages/patches/qemu-CVE-2017-7493.patch \ %D%/packages/patches/qemu-CVE-2017-13711.patch \
%D%/packages/patches/qemu-CVE-2017-8112.patch \ %D%/packages/patches/qemu-CVE-2017-14167.patch \
%D%/packages/patches/qemu-CVE-2017-8309.patch \
%D%/packages/patches/qemu-CVE-2017-8379.patch \
%D%/packages/patches/qemu-CVE-2017-8380.patch \
%D%/packages/patches/qemu-CVE-2017-9524.patch \
%D%/packages/patches/qemu-CVE-2017-10664.patch \
%D%/packages/patches/qemu-CVE-2017-10806.patch \
%D%/packages/patches/qemu-CVE-2017-10911.patch \
%D%/packages/patches/qemu-CVE-2017-11334.patch \
%D%/packages/patches/qemu-CVE-2017-11434.patch \
%D%/packages/patches/qemu-CVE-2017-12809.patch \
%D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/qtscript-disable-tests.patch \
%D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quagga-reproducible-build.patch \

12
gnu/packages.scm
View File

@ -140,17 +140,19 @@ for system '~a'")
directory)) directory))
%load-path))) %load-path)))
(define (fold-packages proc init) (define* (fold-packages proc init
"Call (PROC PACKAGE RESULT) for each available package, using INIT as #:optional
the initial value of RESULT. It is guaranteed to never traverse the (modules (all-modules (%package-module-path))))
same package twice." "Call (PROC PACKAGE RESULT) for each available package defined in one of
MODULES, using INIT as the initial value of RESULT. It is guaranteed to never
traverse the same package twice."
(fold-module-public-variables (lambda (object result) (fold-module-public-variables (lambda (object result)
(if (and (package? object) (if (and (package? object)
(not (hidden-package? object))) (not (hidden-package? object)))
(proc object result) (proc object result)
result)) result))
init init
(all-modules (%package-module-path)))) modules))
(define find-packages-by-name (define find-packages-by-name
(let ((packages (delay (let ((packages (delay

45
gnu/packages/accessibility.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 ng0 <ng0@no-reply.pragmatique.xyz> ;;; Copyright © 2017 ng0 <ng0@no-reply.pragmatique.xyz>
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -20,6 +21,8 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
@ -29,7 +32,8 @@
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages pkg-config)) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages libusb))
(define-public florence (define-public florence
(package (package
@ -76,3 +80,42 @@ available to help to click.")
;; The documentation is under FDL1.2, but we do not install the ;; The documentation is under FDL1.2, but we do not install the
;; documentation. ;; documentation.
(license license:gpl2+))) (license license:gpl2+)))
(define-public footswitch
(let ((commit "7cb0a9333a150c27c7e4746ee827765d244e567a"))
(package
(name "footswitch")
(version (git-version "0.1" "1" commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rgerganov/footswitch")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0mg1vr4a9vls5y435w7wdnr1vb5059gy60lvrdfjgzhd2wwf47iw"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("hidapi" ,hidapi)))
(arguments
`(#:tests? #f ; no tests
#:make-flags (list "CC=gcc")
#:phases (modify-phases %standard-phases
(delete 'configure)
;; Install target in the Makefile does not work for Guix
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out")
"/bin")))
(mkdir-p bin)
(install-file "footswitch" bin)
#t))))))
(home-page "https://github.com/rgerganov/footswitch")
(synopsis "Command line utility for PCsensor foot switch")
(description
"Command line utility for programming foot switches sold by PCsensor.
It works for both single pedal devices and three pedal devices. All supported
devices have vendorId:productId = 0c45:7403 or 0c45:7404.")
(license license:expat))))

11
gnu/packages/admin.scm
View File

@ -661,14 +661,14 @@ network statistics collection, security monitoring, network debugging, etc.")
(define-public tcpdump (define-public tcpdump
(package (package
(name "tcpdump") (name "tcpdump")
(version "4.9.1") (version "4.9.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.tcpdump.org/release/tcpdump-" (uri (string-append "http://www.tcpdump.org/release/tcpdump-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1wyqbg7bkmgqyslf1ns0xx9fcqi66hvcfm9nf77rl15jvvs8qi7r")))) "0ygy0layzqaj838r5xd613iraz09wlfgpyh7pc6cwclql8v3b2vr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("libpcap" ,libpcap) (inputs `(("libpcap" ,libpcap)
("openssl" ,openssl))) ("openssl" ,openssl)))
@ -818,7 +818,7 @@ system administrator.")
(define-public sudo (define-public sudo
(package (package
(name "sudo") (name "sudo")
(version "1.8.20p2") (version "1.8.21p2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -828,7 +828,7 @@ system administrator.")
version ".tar.gz"))) version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1na5likm1srnd1g5sjx7b0543sczw0yppacyqsazfdg9b48awhmx")) "0s33szq6q59v5s377l4v6ybsdy7pfq6sz7y364j4x09ssdn79ibl"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(delete-file-recursively "lib/zlib")))) '(delete-file-recursively "lib/zlib"))))
@ -871,7 +871,8 @@ system administrator.")
"$(TMPDIR)/dummy") "$(TMPDIR)/dummy")
(("\\$\\(DESTDIR\\)\\$\\(vardir\\)") (("\\$\\(DESTDIR\\)\\$\\(vardir\\)")
;; Don't try to create /var/db/sudo. ;; Don't try to create /var/db/sudo.
"$(TMPDIR)/dummy"))))) "$(TMPDIR)/dummy"))
#t)))
;; XXX: The 'testsudoers' test series expects user 'root' to exist, but ;; XXX: The 'testsudoers' test series expects user 'root' to exist, but
;; the chroot's /etc/passwd doesn't have it. Turn off the tests. ;; the chroot's /etc/passwd doesn't have it. Turn off the tests.

24
gnu/packages/aidc.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darringon <jmd@gnu.org> ;;; Copyright © 2014 John Darringon <jmd@gnu.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -69,3 +70,26 @@ a mobile phone with CCD. The capacity of QR Code is up to 7000 digits or 4000
characters, and is highly robust.") characters, and is highly robust.")
(license license:lgpl2.1+) (license license:lgpl2.1+)
(home-page "https://fukuchi.org/works/qrencode"))) (home-page "https://fukuchi.org/works/qrencode")))
(define-public libdmtx
(package
(name "libdmtx")
(version "0.7.4")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://sourceforge/libdmtx/" name "/" version "/"
name "-" version ".tar.bz2"))
(sha256
(base32 "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://libdmtx.sourceforge.net/")
(synopsis "Library for reading and writing Data Matrix 2D barcodes")
(description "libdmtx is open source software for reading and writing Data
Matrix 2D barcodes on Linux and Unix. At its core libdmtx is a shared
library, allowing C/C++ programs to use its capabilities without restrictions
or overhead.")
(license license:bsd-3)))

4
gnu/packages/algebra.scm
View File

@ -133,7 +133,7 @@ solve the shortest vector problem.")
(define-public pari-gp (define-public pari-gp
(package (package
(name "pari-gp") (name "pari-gp")
(version "2.9.2") (version "2.9.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -141,7 +141,7 @@ solve the shortest vector problem.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0zi08qz9nk17wwdna4xb2vp3i3mh5sgv1y8wqbf0j2sfryxlr8ls")))) "0qqal1lpggd6dvs19svnz0dil86xk0xkcj5s3b7104ibkmvjfsp7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("texlive" ,texlive-tiny))) (native-inputs `(("texlive" ,texlive-tiny)))
(inputs `(("gmp" ,gmp) (inputs `(("gmp" ,gmp)

10
gnu/packages/astronomy.scm
View File

@ -64,7 +64,7 @@ in FITS files.")
(define-public wcslib (define-public wcslib
(package (package
(name "wcslib") (name "wcslib")
(version "5.16") (version "5.17")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -72,7 +72,7 @@ in FITS files.")
"ftp://ftp.atnf.csiro.au/pub/software/wcslib/" name "-" version "ftp://ftp.atnf.csiro.au/pub/software/wcslib/" name "-" version
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 "1vwrzkznpig2q40m11j12hsfqvsjz8z44l66pz5fkh6fy461w0zd")))) (base32 "0v23x1fw01arhmqdrzfd9n593mjglhzfyx4793v065z0dg4bb72w"))))
(inputs (inputs
`(("cfitsio" ,cfitsio))) `(("cfitsio" ,cfitsio)))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -83,7 +83,7 @@ in FITS files.")
(substitute* "makedefs.in" (substitute* "makedefs.in"
(("/bin/sh") "sh")) (("/bin/sh") "sh"))
#t))))) #t)))))
(home-page "http://www.atnf.csiro.au/people/mcalabre/WCS") (home-page "https://www.atnf.csiro.au/people/mcalabre/WCS")
(synopsis "Library which implements the FITS WCS standard") (synopsis "Library which implements the FITS WCS standard")
(description "The FITS \"World Coordinate System\" (WCS) standard defines (description "The FITS \"World Coordinate System\" (WCS) standard defines
keywords and usage that provide for the description of astronomical coordinate keywords and usage that provide for the description of astronomical coordinate
@ -93,7 +93,7 @@ systems in a FITS image header.")
(define-public gnuastro (define-public gnuastro
(package (package
(name "gnuastro") (name "gnuastro")
(version "0.3") (version "0.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -101,7 +101,7 @@ systems in a FITS image header.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"109xjwbs36gbkx5sd5yzf6ailfcldc5d28vl1n19z0ylfzww4nwa")))) "1n30zz4kg89ic5h30b7nrxp0bk0ls2m3xnfi81mja56bxxwpihrs"))))
(inputs (inputs
`(("cfitsio" ,cfitsio) `(("cfitsio" ,cfitsio)
("gsl" ,gsl) ("gsl" ,gsl)

54
gnu/packages/audio.scm
View File

@ -328,7 +328,7 @@ engineers, musicians, soundtrack editors and composers.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; FFmpeg is only detected if autoreconf runs. ;; FFmpeg is only detected if autoreconf runs.
(add-before 'configure 'autoreconf (add-after 'unpack 'autoreconf
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vfi"))))) (zero? (system* "autoreconf" "-vfi")))))
;; The test suite is not "well exercised" according to the developers, ;; The test suite is not "well exercised" according to the developers,
@ -568,23 +568,17 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.")
(define-public csound (define-public csound
(package (package
(name "csound") (name "csound")
(version "6.05") (version "6.09.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"mirror://sourceforge/csound/csound6/Csound" "https://github.com/csound/csound/archive/"
version "/Csound" version ".tar.gz")) version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0a1sni6lr7qpwywpggbkp0ia3h9bwwgf9i87gsag8ra2h30v82hd")) "0f67vyy3r29hn26qkkcwnizrnzzy8p7gmg3say5q3wjhxns3b5yl"))))
(patches (search-patches "csound-header-ordering.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments
;; Work around this error on x86_64 with libc 2.22+:
;; libmvec.so.1: error adding symbols: DSO missing from command line
(if (string-prefix? "x86_64" (or (%current-target-system) (%current-system)))
'(#:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-lmvec"))
'()))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("boost" ,boost) ("boost" ,boost)
@ -1084,7 +1078,7 @@ PS, and DAB+.")
(native-inputs (native-inputs
`(("llvm" ,llvm-with-rtti) `(("llvm" ,llvm-with-rtti)
("which" ,which) ("which" ,which)
("xxd" ,vim) ("xxd" ,xxd)
("ctags" ,emacs-minimal) ; for ctags ("ctags" ,emacs-minimal) ; for ctags
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
@ -1136,7 +1130,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
(define-public guitarix (define-public guitarix
(package (package
(name "guitarix") (name "guitarix")
(version "0.35.5") (version "0.35.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1144,7 +1138,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"00pfb6qa3jfa6qaql7isnb8srfdfmk362ygslh7y0qkm36qasmh4")))) "0ffvfnvhj6vz73zsrpi88hs69ys4zskm847zf825dl2r39n9nn41"))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
@ -1979,8 +1973,8 @@ tempo and pitch of an audio recording independently of one another.")
(arguments (arguments
`(#:tests? #f ;no "check" target `(#:tests? #f ;no "check" target
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before (add-after
'configure 'autoconf 'unpack 'autoconf
(lambda _ (zero? (system* "autoreconf" "-vfi")))) (lambda _ (zero? (system* "autoreconf" "-vfi"))))
(add-before (add-before
'build 'fix-makefile 'build 'fix-makefile
@ -2906,3 +2900,29 @@ code, used in @code{libtoxcore}.")
06.10 RPE-LTP lossy speech compression algorithm.") 06.10 RPE-LTP lossy speech compression algorithm.")
(home-page "http://quut.com/gsm/") (home-page "http://quut.com/gsm/")
(license (license:non-copyleft "file://COPYRIGHT")))) (license (license:non-copyleft "file://COPYRIGHT"))))
(define-public python-pyalsaaudio
(package
(name "python-pyalsaaudio")
(version "0.8.4")
(source (origin
(method url-fetch)
(uri (pypi-uri "pyalsaaudio" version))
(sha256
(base32
"1180ypn9596rq4b7y7dyv627j1q0fqilmkkrckclnzsdakdgis44"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ; tests require access to ALSA devices.
(inputs
`(("alsa-lib" ,alsa-lib)))
(home-page "http://larsimmisch.github.io/pyalsaaudio/")
(synopsis "ALSA wrappers for Python")
(description
"This package contains wrappers for accessing the ALSA API from Python.
It is currently fairly complete for PCM devices, and has some support for
mixers.")
(license license:psfl)))
(define-public python2-pyalsaaudio
(package-with-python2 python-pyalsaaudio))

190
gnu/packages/aux-files/linux-libre/4.12-i686.conf → gnu/packages/aux-files/linux-libre/4.13-i686.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 4.12.0-gnu Kernel Configuration # Linux/x86 4.13.0-gnu Kernel Configuration
# #
# CONFIG_64BIT is not set # CONFIG_64BIT is not set
CONFIG_X86_32=y CONFIG_X86_32=y
@ -84,7 +84,9 @@ CONFIG_AUDIT_TREE=y
# #
CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
CONFIG_GENERIC_PENDING_IRQ=y CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_GENERIC_IRQ_MIGRATION=y
CONFIG_GENERIC_IRQ_CHIP=y CONFIG_GENERIC_IRQ_CHIP=y
CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN=y
CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_IRQ_DOMAIN_HIERARCHY=y
@ -93,6 +95,7 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
# CONFIG_IRQ_DOMAIN_DEBUG is not set # CONFIG_IRQ_DOMAIN_DEBUG is not set
CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y CONFIG_SPARSE_IRQ=y
# CONFIG_GENERIC_IRQ_DEBUGFS is not set
CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_ARCH_CLOCKSOURCE_DATA=y
CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
@ -134,7 +137,6 @@ CONFIG_TREE_SRCU=y
# CONFIG_TASKS_RCU is not set # CONFIG_TASKS_RCU is not set
CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_RCU_NEED_SEGCBLIST=y
# CONFIG_TREE_RCU_TRACE is not set
CONFIG_BUILD_BIN2C=y CONFIG_BUILD_BIN2C=y
# CONFIG_IKCONFIG is not set # CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=17 CONFIG_LOG_BUF_SHIFT=17
@ -237,6 +239,7 @@ CONFIG_SLUB_DEBUG=y
# CONFIG_SLAB is not set # CONFIG_SLAB is not set
CONFIG_SLUB=y CONFIG_SLUB=y
# CONFIG_SLOB is not set # CONFIG_SLOB is not set
CONFIG_SLAB_MERGE_DEFAULT=y
CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_RANDOM=y
CONFIG_SLUB_CPU_PARTIAL=y CONFIG_SLUB_CPU_PARTIAL=y
# CONFIG_SYSTEM_DATA_VERIFICATION is not set # CONFIG_SYSTEM_DATA_VERIFICATION is not set
@ -268,6 +271,7 @@ CONFIG_HAVE_NMI=y
CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_MEMORY=y
CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
@ -277,6 +281,7 @@ CONFIG_HAVE_HW_BREAKPOINT=y
CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y
CONFIG_HAVE_PERF_EVENTS_NMI=y CONFIG_HAVE_PERF_EVENTS_NMI=y
CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_REGS=y
CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_JUMP_LABEL=y
@ -292,11 +297,13 @@ CONFIG_GCC_PLUGINS=y
# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set # CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_HAVE_CC_STACKPROTECTOR=y
CONFIG_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y
# CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_NONE is not set
# CONFIG_CC_STACKPROTECTOR_REGULAR is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_CC_STACKPROTECTOR_STRONG=y
CONFIG_THIN_ARCHIVES=y
CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
@ -320,6 +327,7 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
CONFIG_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y
CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
CONFIG_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y
CONFIG_REFCOUNT_FULL=y
# #
# GCOV-based kernel profiling # GCOV-based kernel profiling
@ -522,6 +530,7 @@ CONFIG_X86_MCE_INTEL=y
CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_AMD=y
# CONFIG_X86_ANCIENT_MCE is not set # CONFIG_X86_ANCIENT_MCE is not set
CONFIG_X86_MCE_THRESHOLD=y CONFIG_X86_MCE_THRESHOLD=y
# CONFIG_X86_MCE_INJECT is not set
CONFIG_X86_THERMAL_VECTOR=y CONFIG_X86_THERMAL_VECTOR=y
# #
@ -568,6 +577,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y
CONFIG_SPARSEMEM_STATIC=y CONFIG_SPARSEMEM_STATIC=y
CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
CONFIG_HAVE_GENERIC_GUP=y
CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_ARCH_DISCARD_MEMBLOCK=y
CONFIG_MEMORY_ISOLATION=y CONFIG_MEMORY_ISOLATION=y
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
@ -590,6 +600,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
# CONFIG_ARCH_WANTS_THP_SWAP is not set
CONFIG_TRANSPARENT_HUGE_PAGECACHE=y CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
CONFIG_CLEANCACHE=y CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y CONFIG_FRONTSWAP=y
@ -609,6 +620,7 @@ CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
CONFIG_IDLE_PAGE_TRACKING=y CONFIG_IDLE_PAGE_TRACKING=y
CONFIG_FRAME_VECTOR=y CONFIG_FRAME_VECTOR=y
# CONFIG_PERCPU_STATS is not set
CONFIG_X86_PMEM_LEGACY_DEVICE=y CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=y CONFIG_X86_PMEM_LEGACY=y
CONFIG_HIGHPTE=y CONFIG_HIGHPTE=y
@ -832,6 +844,7 @@ CONFIG_PCI_STUB=m
CONFIG_XEN_PCIDEV_FRONTEND=m CONFIG_XEN_PCIDEV_FRONTEND=m
CONFIG_HT_IRQ=y CONFIG_HT_IRQ=y
CONFIG_PCI_ATS=y CONFIG_PCI_ATS=y
CONFIG_PCI_LOCKLESS_CONFIG=y
CONFIG_PCI_IOV=y CONFIG_PCI_IOV=y
CONFIG_PCI_PRI=y CONFIG_PCI_PRI=y
CONFIG_PCI_PASID=y CONFIG_PCI_PASID=y
@ -943,6 +956,7 @@ CONFIG_PACKET=y
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m CONFIG_UNIX_DIAG=m
CONFIG_TLS=m
CONFIG_XFRM=y CONFIG_XFRM=y
CONFIG_XFRM_OFFLOAD=y CONFIG_XFRM_OFFLOAD=y
CONFIG_XFRM_ALGO=m CONFIG_XFRM_ALGO=m
@ -1451,10 +1465,11 @@ CONFIG_HAVE_NET_DSA=y
CONFIG_NET_DSA=m CONFIG_NET_DSA=m
CONFIG_NET_DSA_TAG_DSA=y CONFIG_NET_DSA_TAG_DSA=y
CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_DSA_TAG_EDSA=y
CONFIG_NET_DSA_TAG_KSZ=y
CONFIG_NET_DSA_TAG_LAN9303=y
CONFIG_NET_DSA_TAG_MTK=y
CONFIG_NET_DSA_TAG_TRAILER=y CONFIG_NET_DSA_TAG_TRAILER=y
CONFIG_NET_DSA_TAG_QCA=y CONFIG_NET_DSA_TAG_QCA=y
CONFIG_NET_DSA_TAG_MTK=y
CONFIG_NET_DSA_TAG_LAN9303=y
CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_GVRP=y
CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLAN_8021Q_MVRP=y
@ -1971,6 +1986,10 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_CMDLINE_PARTS=m
CONFIG_MTD_AR7_PARTS=m CONFIG_MTD_AR7_PARTS=m
#
# Partition parsers
#
# #
# User Modules And Translation Layers # User Modules And Translation Layers
# #
@ -2046,6 +2065,7 @@ CONFIG_MTD_DATAFLASH=m
# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
CONFIG_MTD_DATAFLASH_OTP=y CONFIG_MTD_DATAFLASH_OTP=y
CONFIG_MTD_M25P80=m CONFIG_MTD_M25P80=m
CONFIG_MTD_MCHP23K256=m
CONFIG_MTD_SST25L=m CONFIG_MTD_SST25L=m
CONFIG_MTD_SLRAM=m CONFIG_MTD_SLRAM=m
CONFIG_MTD_PHRAM=m CONFIG_MTD_PHRAM=m
@ -2080,8 +2100,6 @@ CONFIG_MTD_NAND_CAFE=m
CONFIG_MTD_NAND_CS553X=m CONFIG_MTD_NAND_CS553X=m
CONFIG_MTD_NAND_NANDSIM=m CONFIG_MTD_NAND_NANDSIM=m
CONFIG_MTD_NAND_PLATFORM=m CONFIG_MTD_NAND_PLATFORM=m
CONFIG_MTD_NAND_HISI504=m
CONFIG_MTD_NAND_MTK=m
CONFIG_MTD_ONENAND=m CONFIG_MTD_ONENAND=m
CONFIG_MTD_ONENAND_VERIFY_WRITE=y CONFIG_MTD_ONENAND_VERIFY_WRITE=y
CONFIG_MTD_ONENAND_GENERIC=m CONFIG_MTD_ONENAND_GENERIC=m
@ -2189,7 +2207,6 @@ CONFIG_BLK_DEV_RBD=m
CONFIG_BLK_DEV_RSXX=m CONFIG_BLK_DEV_RSXX=m
CONFIG_NVME_CORE=m CONFIG_NVME_CORE=m
CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_NVME=m
# CONFIG_BLK_DEV_NVME_SCSI is not set
CONFIG_NVME_FABRICS=m CONFIG_NVME_FABRICS=m
CONFIG_NVME_RDMA=m CONFIG_NVME_RDMA=m
CONFIG_NVME_FC=m CONFIG_NVME_FC=m
@ -2299,6 +2316,7 @@ CONFIG_VHOST_RING=m
CONFIG_ECHO=m CONFIG_ECHO=m
# CONFIG_CXL_BASE is not set # CONFIG_CXL_BASE is not set
# CONFIG_CXL_AFU_DRIVER_OPS is not set # CONFIG_CXL_AFU_DRIVER_OPS is not set
# CONFIG_CXL_LIB is not set
CONFIG_HAVE_IDE=y CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set # CONFIG_IDE is not set
@ -2616,6 +2634,7 @@ CONFIG_DM_VERITY=m
CONFIG_DM_SWITCH=m CONFIG_DM_SWITCH=m
CONFIG_DM_LOG_WRITES=m CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m CONFIG_DM_INTEGRITY=m
CONFIG_DM_ZONED=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m CONFIG_TCM_FILEIO=m
@ -2739,17 +2758,19 @@ CONFIG_CAIF_VIRTIO=m
# #
# Distributed Switch Architecture drivers # Distributed Switch Architecture drivers
# #
CONFIG_NET_DSA_MV88E6060=m
CONFIG_B53=m CONFIG_B53=m
CONFIG_B53_SPI_DRIVER=m CONFIG_B53_SPI_DRIVER=m
CONFIG_B53_MDIO_DRIVER=m CONFIG_B53_MDIO_DRIVER=m
CONFIG_B53_MMAP_DRIVER=m CONFIG_B53_MMAP_DRIVER=m
CONFIG_B53_SRAB_DRIVER=m CONFIG_B53_SRAB_DRIVER=m
# CONFIG_NET_DSA_LOOP is not set
CONFIG_NET_DSA_MT7530=m
CONFIG_NET_DSA_MV88E6060=m
CONFIG_MICROCHIP_KSZ=m
CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m
CONFIG_NET_DSA_MV88E6XXX=m CONFIG_NET_DSA_MV88E6XXX=m
CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
CONFIG_NET_DSA_QCA8K=m CONFIG_NET_DSA_QCA8K=m
# CONFIG_NET_DSA_LOOP is not set
CONFIG_NET_DSA_MT7530=m
CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303=m
CONFIG_NET_DSA_SMSC_LAN9303_I2C=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
@ -2795,6 +2816,7 @@ CONFIG_NET_VENDOR_AURORA=y
CONFIG_AURORA_NB8800=m CONFIG_AURORA_NB8800=m
CONFIG_NET_CADENCE=y CONFIG_NET_CADENCE=y
CONFIG_MACB=m CONFIG_MACB=m
CONFIG_MACB_USE_HWSTAMP=y
CONFIG_MACB_PCI=m CONFIG_MACB_PCI=m
CONFIG_NET_VENDOR_BROADCOM=y CONFIG_NET_VENDOR_BROADCOM=y
CONFIG_B44=m CONFIG_B44=m
@ -2892,6 +2914,7 @@ CONFIG_MLX4_EN_DCB=y
CONFIG_MLX4_CORE=m CONFIG_MLX4_CORE=m
CONFIG_MLX4_DEBUG=y CONFIG_MLX4_DEBUG=y
CONFIG_MLX5_CORE=m CONFIG_MLX5_CORE=m
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN_DCB=y
# CONFIG_MLX5_CORE_IPOIB is not set # CONFIG_MLX5_CORE_IPOIB is not set
@ -2905,6 +2928,7 @@ CONFIG_MLXSW_SWITCHX2=m
CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SPECTRUM=m
CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM_DCB=y
CONFIG_MLXSW_MINIMAL=m CONFIG_MLXSW_MINIMAL=m
CONFIG_MLXFW=m
CONFIG_NET_VENDOR_MICREL=y CONFIG_NET_VENDOR_MICREL=y
CONFIG_KS8842=m CONFIG_KS8842=m
CONFIG_KS8851=m CONFIG_KS8851=m
@ -2922,6 +2946,7 @@ CONFIG_NATSEMI=m
CONFIG_NS83820=m CONFIG_NS83820=m
CONFIG_NET_VENDOR_NETRONOME=y CONFIG_NET_VENDOR_NETRONOME=y
CONFIG_NFP=m CONFIG_NFP=m
# CONFIG_NFP_APP_FLOWER is not set
# CONFIG_NFP_DEBUG is not set # CONFIG_NFP_DEBUG is not set
CONFIG_NET_VENDOR_8390=y CONFIG_NET_VENDOR_8390=y
CONFIG_PCMCIA_AXNET=m CONFIG_PCMCIA_AXNET=m
@ -3029,6 +3054,7 @@ CONFIG_SKFP=m
# CONFIG_HIPPI is not set # CONFIG_HIPPI is not set
CONFIG_NET_SB1000=m CONFIG_NET_SB1000=m
CONFIG_MDIO_DEVICE=y CONFIG_MDIO_DEVICE=y
CONFIG_MDIO_BUS=y
CONFIG_MDIO_BITBANG=m CONFIG_MDIO_BITBANG=m
CONFIG_MDIO_GPIO=m CONFIG_MDIO_GPIO=m
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
@ -3046,6 +3072,7 @@ CONFIG_BCM87XX_PHY=m
CONFIG_BCM_NET_PHYLIB=m CONFIG_BCM_NET_PHYLIB=m
CONFIG_BROADCOM_PHY=m CONFIG_BROADCOM_PHY=m
CONFIG_CICADA_PHY=m CONFIG_CICADA_PHY=m
CONFIG_CORTINA_PHY=m
CONFIG_DAVICOM_PHY=m CONFIG_DAVICOM_PHY=m
CONFIG_DP83848_PHY=m CONFIG_DP83848_PHY=m
CONFIG_DP83867_PHY=m CONFIG_DP83867_PHY=m
@ -3055,6 +3082,7 @@ CONFIG_INTEL_XWAY_PHY=m
CONFIG_LSI_ET1011C_PHY=m CONFIG_LSI_ET1011C_PHY=m
CONFIG_LXT_PHY=m CONFIG_LXT_PHY=m
CONFIG_MARVELL_PHY=m CONFIG_MARVELL_PHY=m
CONFIG_MARVELL_10G_PHY=m
CONFIG_MICREL_PHY=m CONFIG_MICREL_PHY=m
CONFIG_MICROCHIP_PHY=m CONFIG_MICROCHIP_PHY=m
CONFIG_MICROSEMI_PHY=m CONFIG_MICROSEMI_PHY=m
@ -3173,6 +3201,7 @@ CONFIG_WIL6210_ISR_COR=y
CONFIG_WIL6210_TRACING=y CONFIG_WIL6210_TRACING=y
CONFIG_ATH10K=m CONFIG_ATH10K=m
CONFIG_ATH10K_PCI=m CONFIG_ATH10K_PCI=m
CONFIG_ATH10K_SDIO=m
# CONFIG_ATH10K_DEBUG is not set # CONFIG_ATH10K_DEBUG is not set
CONFIG_ATH10K_DEBUGFS=y CONFIG_ATH10K_DEBUGFS=y
CONFIG_ATH10K_TRACING=y CONFIG_ATH10K_TRACING=y
@ -3377,6 +3406,9 @@ CONFIG_WLAN_VENDOR_ZYDAS=y
CONFIG_USB_ZD1201=m CONFIG_USB_ZD1201=m
CONFIG_ZD1211RW=m CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set # CONFIG_ZD1211RW_DEBUG is not set
CONFIG_WLAN_VENDOR_QUANTENNA=y
CONFIG_QTNFMAC=m
CONFIG_QTNFMAC_PEARL_PCIE=m
CONFIG_PCMCIA_RAYCS=m CONFIG_PCMCIA_RAYCS=m
CONFIG_PCMCIA_WL3501=m CONFIG_PCMCIA_WL3501=m
CONFIG_MAC80211_HWSIM=m CONFIG_MAC80211_HWSIM=m
@ -3607,6 +3639,7 @@ CONFIG_KEYBOARD_ADP5589=m
CONFIG_KEYBOARD_ATKBD=y CONFIG_KEYBOARD_ATKBD=y
CONFIG_KEYBOARD_QT1070=m CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_QT2160=m CONFIG_KEYBOARD_QT2160=m
CONFIG_KEYBOARD_DLINK_DIR685=m
CONFIG_KEYBOARD_LKKBD=m CONFIG_KEYBOARD_LKKBD=m
CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_GPIO=m
CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_GPIO_POLLED=m
@ -3785,6 +3818,7 @@ CONFIG_TOUCHSCREEN_RM_TS=m
CONFIG_TOUCHSCREEN_SILEAD=m CONFIG_TOUCHSCREEN_SILEAD=m
CONFIG_TOUCHSCREEN_SIS_I2C=m CONFIG_TOUCHSCREEN_SIS_I2C=m
CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_TOUCHSCREEN_STMFTS=m
CONFIG_TOUCHSCREEN_SUR40=m CONFIG_TOUCHSCREEN_SUR40=m
CONFIG_TOUCHSCREEN_SURFACE3_SPI=m CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
CONFIG_TOUCHSCREEN_SX8654=m CONFIG_TOUCHSCREEN_SX8654=m
@ -3994,6 +4028,7 @@ CONFIG_HVC_XEN=y
CONFIG_HVC_XEN_FRONTEND=y CONFIG_HVC_XEN_FRONTEND=y
CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_CONSOLE=y
CONFIG_IPMI_HANDLER=m CONFIG_IPMI_HANDLER=m
CONFIG_IPMI_DMI_DECODE=y
# CONFIG_IPMI_PANIC_EVENT is not set # CONFIG_IPMI_PANIC_EVENT is not set
CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_DEVICE_INTERFACE=m
CONFIG_IPMI_SI=m CONFIG_IPMI_SI=m
@ -4112,8 +4147,9 @@ CONFIG_I2C_SCMI=m
# I2C system bus drivers (mostly embedded / system-on-chip) # I2C system bus drivers (mostly embedded / system-on-chip)
# #
CONFIG_I2C_CBUS_GPIO=m CONFIG_I2C_CBUS_GPIO=m
CONFIG_I2C_DESIGNWARE_CORE=m CONFIG_I2C_DESIGNWARE_CORE=y
CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_I2C_DESIGNWARE_PLATFORM=y
# CONFIG_I2C_DESIGNWARE_SLAVE is not set
CONFIG_I2C_DESIGNWARE_PCI=m CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_DESIGNWARE_BAYTRAIL=y CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
CONFIG_I2C_EG20T=m CONFIG_I2C_EG20T=m
@ -4185,6 +4221,7 @@ CONFIG_SPI_ZYNQMP_GQSPI=m
CONFIG_SPI_SPIDEV=m CONFIG_SPI_SPIDEV=m
# CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_TLE62X0=m CONFIG_SPI_TLE62X0=m
# CONFIG_SPI_SLAVE is not set
CONFIG_SPMI=m CONFIG_SPMI=m
CONFIG_HSI=m CONFIG_HSI=m
CONFIG_HSI_BOARDINFO=y CONFIG_HSI_BOARDINFO=y
@ -4197,10 +4234,6 @@ CONFIG_HSI_BOARDINFO=y
# HSI clients # HSI clients
# #
CONFIG_HSI_CHAR=m CONFIG_HSI_CHAR=m
#
# PPS support
#
CONFIG_PPS=m CONFIG_PPS=m
# CONFIG_PPS_DEBUG is not set # CONFIG_PPS_DEBUG is not set
@ -4236,12 +4269,14 @@ CONFIG_PINCONF=y
CONFIG_GENERIC_PINCONF=y CONFIG_GENERIC_PINCONF=y
# CONFIG_DEBUG_PINCTRL is not set # CONFIG_DEBUG_PINCTRL is not set
CONFIG_PINCTRL_AMD=y CONFIG_PINCTRL_AMD=y
CONFIG_PINCTRL_MCP23S08=m
CONFIG_PINCTRL_SX150X=y CONFIG_PINCTRL_SX150X=y
CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BAYTRAIL=y
CONFIG_PINCTRL_CHERRYVIEW=m CONFIG_PINCTRL_CHERRYVIEW=m
CONFIG_PINCTRL_MERRIFIELD=m CONFIG_PINCTRL_MERRIFIELD=m
CONFIG_PINCTRL_INTEL=m CONFIG_PINCTRL_INTEL=m
CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_BROXTON=m
CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_GEMINILAKE=m CONFIG_PINCTRL_GEMINILAKE=m
CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_PINCTRL_SUNRISEPOINT=m
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
@ -4334,10 +4369,7 @@ CONFIG_GPIO_RDC321X=m
CONFIG_GPIO_MAX7301=m CONFIG_GPIO_MAX7301=m
CONFIG_GPIO_MC33880=m CONFIG_GPIO_MC33880=m
CONFIG_GPIO_PISOSR=m CONFIG_GPIO_PISOSR=m
CONFIG_GPIO_XRA1403=m
#
# SPI or I2C GPIO expanders
#
# #
# USB GPIO expanders # USB GPIO expanders
@ -4396,6 +4428,7 @@ CONFIG_BATTERY_SBS=m
CONFIG_CHARGER_SBS=m CONFIG_CHARGER_SBS=m
CONFIG_BATTERY_BQ27XXX=m CONFIG_BATTERY_BQ27XXX=m
CONFIG_BATTERY_BQ27XXX_I2C=m CONFIG_BATTERY_BQ27XXX_I2C=m
# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
CONFIG_BATTERY_DA9030=m CONFIG_BATTERY_DA9030=m
CONFIG_BATTERY_DA9052=m CONFIG_BATTERY_DA9052=m
CONFIG_CHARGER_DA9150=m CONFIG_CHARGER_DA9150=m
@ -4418,6 +4451,7 @@ CONFIG_CHARGER_LP8727=m
CONFIG_CHARGER_LP8788=m CONFIG_CHARGER_LP8788=m
CONFIG_CHARGER_GPIO=m CONFIG_CHARGER_GPIO=m
CONFIG_CHARGER_MANAGER=y CONFIG_CHARGER_MANAGER=y
CONFIG_CHARGER_LTC3651=m
CONFIG_CHARGER_MAX14577=m CONFIG_CHARGER_MAX14577=m
CONFIG_CHARGER_MAX77693=m CONFIG_CHARGER_MAX77693=m
CONFIG_CHARGER_MAX8997=m CONFIG_CHARGER_MAX8997=m
@ -4543,6 +4577,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_PMBUS=m CONFIG_PMBUS=m
CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_ADM1275=m CONFIG_SENSORS_ADM1275=m
CONFIG_SENSORS_IR35221=m
CONFIG_SENSORS_LM25066=m CONFIG_SENSORS_LM25066=m
CONFIG_SENSORS_LTC2978=m CONFIG_SENSORS_LTC2978=m
CONFIG_SENSORS_LTC2978_REGULATOR=y CONFIG_SENSORS_LTC2978_REGULATOR=y
@ -4641,6 +4676,7 @@ CONFIG_GENERIC_ADC_THERMAL=m
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set
CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
CONFIG_WATCHDOG_SYSFS=y CONFIG_WATCHDOG_SYSFS=y
# #
@ -4798,6 +4834,7 @@ CONFIG_LPC_ICH=m
CONFIG_LPC_SCH=m CONFIG_LPC_SCH=m
CONFIG_INTEL_SOC_PMIC=y CONFIG_INTEL_SOC_PMIC=y
CONFIG_INTEL_SOC_PMIC_BXTWC=m CONFIG_INTEL_SOC_PMIC_BXTWC=m
CONFIG_INTEL_SOC_PMIC_CHTWC=m
CONFIG_MFD_INTEL_LPSS=m CONFIG_MFD_INTEL_LPSS=m
CONFIG_MFD_INTEL_LPSS_ACPI=m CONFIG_MFD_INTEL_LPSS_ACPI=m
CONFIG_MFD_INTEL_LPSS_PCI=m CONFIG_MFD_INTEL_LPSS_PCI=m
@ -4991,6 +5028,7 @@ CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_TUNER=m
CONFIG_V4L2_MEM2MEM_DEV=m CONFIG_V4L2_MEM2MEM_DEV=m
CONFIG_V4L2_FLASH_LED_CLASS=m CONFIG_V4L2_FLASH_LED_CLASS=m
CONFIG_V4L2_FWNODE=m
CONFIG_VIDEOBUF_GEN=m CONFIG_VIDEOBUF_GEN=m
CONFIG_VIDEOBUF_DMA_SG=m CONFIG_VIDEOBUF_DMA_SG=m
CONFIG_VIDEOBUF_VMALLOC=m CONFIG_VIDEOBUF_VMALLOC=m
@ -5312,6 +5350,7 @@ CONFIG_VIDEO_VIVID_MAX_DEVS=64
CONFIG_VIDEO_VIM2M=m CONFIG_VIDEO_VIM2M=m
CONFIG_DVB_PLATFORM_DRIVERS=y CONFIG_DVB_PLATFORM_DRIVERS=y
CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEC_PLATFORM_DRIVERS=y
CONFIG_SDR_PLATFORM_DRIVERS=y
# #
# Supported MMC/SDIO adapters # Supported MMC/SDIO adapters
@ -5467,6 +5506,10 @@ CONFIG_VIDEO_UPD64083=m
# #
CONFIG_VIDEO_SAA6752HS=m CONFIG_VIDEO_SAA6752HS=m
#
# SDR tuner chips
#
# #
# Miscellaneous helper chips # Miscellaneous helper chips
# #
@ -5744,6 +5787,7 @@ CONFIG_DRM_I915_USERPTR=y
# CONFIG_DRM_I915_WERROR is not set # CONFIG_DRM_I915_WERROR is not set
# CONFIG_DRM_I915_DEBUG is not set # CONFIG_DRM_I915_DEBUG is not set
# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set # CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
# CONFIG_DRM_I915_SELFTEST is not set # CONFIG_DRM_I915_SELFTEST is not set
# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
@ -5767,6 +5811,7 @@ CONFIG_DRM_PANEL=y
# Display Panels # Display Panels
# #
CONFIG_DRM_BRIDGE=y CONFIG_DRM_BRIDGE=y
CONFIG_DRM_PANEL_BRIDGE=y
# #
# Display Interface Bridges # Display Interface Bridges
@ -5972,20 +6017,17 @@ CONFIG_SND_PCM_ELD=y
CONFIG_SND_PCM_IEC958=y CONFIG_SND_PCM_IEC958=y
CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_DMAENGINE_PCM=m
CONFIG_SND_HWDEP=m CONFIG_SND_HWDEP=m
CONFIG_SND_SEQ_DEVICE=m
CONFIG_SND_RAWMIDI=m CONFIG_SND_RAWMIDI=m
CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_COMPRESS_OFFLOAD=m
CONFIG_SND_JACK=y CONFIG_SND_JACK=y
CONFIG_SND_JACK_INPUT_DEV=y CONFIG_SND_JACK_INPUT_DEV=y
CONFIG_SND_SEQUENCER=m
CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_OSSEMUL=y CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=m CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_PCM_TIMER=y CONFIG_SND_PCM_TIMER=y
# CONFIG_SND_SEQUENCER_OSS is not set
CONFIG_SND_HRTIMER=m CONFIG_SND_HRTIMER=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_MAX_CARDS=32 CONFIG_SND_MAX_CARDS=32
CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_SUPPORT_OLD_API=y
@ -5995,14 +6037,19 @@ CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_DEBUG is not set # CONFIG_SND_DEBUG is not set
CONFIG_SND_VMASTER=y CONFIG_SND_VMASTER=y
CONFIG_SND_DMA_SGBUF=y CONFIG_SND_DMA_SGBUF=y
CONFIG_SND_RAWMIDI_SEQ=m CONFIG_SND_SEQUENCER=m
CONFIG_SND_OPL3_LIB_SEQ=m CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_OPL4_LIB_SEQ=m # CONFIG_SND_SEQUENCER_OSS is not set
CONFIG_SND_SBAWE_SEQ=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_EMU10K1_SEQ=m CONFIG_SND_SEQ_MIDI_EVENT=m
CONFIG_SND_SEQ_MIDI=m
CONFIG_SND_SEQ_MIDI_EMUL=m
CONFIG_SND_SEQ_VIRMIDI=m
CONFIG_SND_MPU401_UART=m CONFIG_SND_MPU401_UART=m
CONFIG_SND_OPL3_LIB=m CONFIG_SND_OPL3_LIB=m
CONFIG_SND_OPL4_LIB=m CONFIG_SND_OPL4_LIB=m
CONFIG_SND_OPL3_LIB_SEQ=m
CONFIG_SND_OPL4_LIB_SEQ=m
CONFIG_SND_VX_LIB=m CONFIG_SND_VX_LIB=m
CONFIG_SND_AC97_CODEC=m CONFIG_SND_AC97_CODEC=m
CONFIG_SND_DRIVERS=y CONFIG_SND_DRIVERS=y
@ -6050,6 +6097,7 @@ CONFIG_SND_MIRO=m
CONFIG_SND_SB8=m CONFIG_SND_SB8=m
CONFIG_SND_SB16=m CONFIG_SND_SB16=m
CONFIG_SND_SBAWE=m CONFIG_SND_SBAWE=m
CONFIG_SND_SBAWE_SEQ=m
CONFIG_SND_SB16_CSP=y CONFIG_SND_SB16_CSP=y
CONFIG_SND_SSCAPE=m CONFIG_SND_SSCAPE=m
CONFIG_SND_WAVEFRONT=m CONFIG_SND_WAVEFRONT=m
@ -6095,6 +6143,7 @@ CONFIG_SND_INDIGODJ=m
CONFIG_SND_INDIGOIOX=m CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGODJX=m CONFIG_SND_INDIGODJX=m
CONFIG_SND_EMU10K1=m CONFIG_SND_EMU10K1=m
CONFIG_SND_EMU10K1_SEQ=m
CONFIG_SND_EMU10K1X=m CONFIG_SND_EMU10K1X=m
CONFIG_SND_ENS1370=m CONFIG_SND_ENS1370=m
CONFIG_SND_ENS1371=m CONFIG_SND_ENS1371=m
@ -6236,11 +6285,18 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SKYLAKE=m
CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
#
# STMicroelectronics STM32 SOC audio support
#
CONFIG_SND_SOC_XTFPGA_I2S=m CONFIG_SND_SOC_XTFPGA_I2S=m
CONFIG_ZX_TDM=m CONFIG_ZX_TDM=m
CONFIG_SND_SOC_I2C_AND_SPI=m CONFIG_SND_SOC_I2C_AND_SPI=m
@ -6288,6 +6344,7 @@ CONFIG_SND_SOC_DIO2125=m
CONFIG_SND_SOC_DMIC=m CONFIG_SND_SOC_DMIC=m
CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_HDMI_CODEC=m
CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES7134=m
CONFIG_SND_SOC_ES8316=m
CONFIG_SND_SOC_ES8328=m CONFIG_SND_SOC_ES8328=m
CONFIG_SND_SOC_ES8328_I2C=m CONFIG_SND_SOC_ES8328_I2C=m
CONFIG_SND_SOC_ES8328_SPI=m CONFIG_SND_SOC_ES8328_SPI=m
@ -6315,11 +6372,13 @@ CONFIG_SND_SOC_RL6231=m
CONFIG_SND_SOC_RL6347A=m CONFIG_SND_SOC_RL6347A=m
CONFIG_SND_SOC_RT286=m CONFIG_SND_SOC_RT286=m
CONFIG_SND_SOC_RT298=m CONFIG_SND_SOC_RT298=m
CONFIG_SND_SOC_RT5514=m
CONFIG_SND_SOC_RT5616=m CONFIG_SND_SOC_RT5616=m
CONFIG_SND_SOC_RT5631=m CONFIG_SND_SOC_RT5631=m
CONFIG_SND_SOC_RT5640=m CONFIG_SND_SOC_RT5640=m
CONFIG_SND_SOC_RT5645=m CONFIG_SND_SOC_RT5645=m
CONFIG_SND_SOC_RT5651=m CONFIG_SND_SOC_RT5651=m
CONFIG_SND_SOC_RT5663=m
CONFIG_SND_SOC_RT5670=m CONFIG_SND_SOC_RT5670=m
CONFIG_SND_SOC_RT5677=m CONFIG_SND_SOC_RT5677=m
CONFIG_SND_SOC_RT5677_SPI=m CONFIG_SND_SOC_RT5677_SPI=m
@ -6370,6 +6429,7 @@ CONFIG_SND_SOC_WM8962=m
CONFIG_SND_SOC_WM8974=m CONFIG_SND_SOC_WM8974=m
CONFIG_SND_SOC_WM8978=m CONFIG_SND_SOC_WM8978=m
CONFIG_SND_SOC_WM8985=m CONFIG_SND_SOC_WM8985=m
CONFIG_SND_SOC_ZX_AUD96P22=m
CONFIG_SND_SOC_NAU8540=m CONFIG_SND_SOC_NAU8540=m
CONFIG_SND_SOC_NAU8810=m CONFIG_SND_SOC_NAU8810=m
CONFIG_SND_SOC_NAU8824=m CONFIG_SND_SOC_NAU8824=m
@ -6379,6 +6439,7 @@ CONFIG_SND_SIMPLE_CARD_UTILS=m
CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_X86=y CONFIG_SND_X86=y
CONFIG_HDMI_LPE_AUDIO=m CONFIG_HDMI_LPE_AUDIO=m
CONFIG_SND_SYNTH_EMUX=m
CONFIG_AC97_BUS=m CONFIG_AC97_BUS=m
# #
@ -6427,6 +6488,7 @@ CONFIG_HID_UCLOGIC=m
CONFIG_HID_WALTOP=m CONFIG_HID_WALTOP=m
CONFIG_HID_GYRATION=m CONFIG_HID_GYRATION=m
CONFIG_HID_ICADE=m CONFIG_HID_ICADE=m
CONFIG_HID_ITE=m
CONFIG_HID_TWINHAN=m CONFIG_HID_TWINHAN=m
CONFIG_HID_KENSINGTON=m CONFIG_HID_KENSINGTON=m
CONFIG_HID_LCPOWER=m CONFIG_HID_LCPOWER=m
@ -6459,6 +6521,7 @@ CONFIG_HID_PICOLCD_LEDS=y
CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PICOLCD_CIR=y
CONFIG_HID_PLANTRONICS=m CONFIG_HID_PLANTRONICS=m
CONFIG_HID_PRIMAX=m CONFIG_HID_PRIMAX=m
CONFIG_HID_RETRODE=m
CONFIG_HID_ROCCAT=m CONFIG_HID_ROCCAT=m
CONFIG_HID_SAITEK=m CONFIG_HID_SAITEK=m
CONFIG_HID_SAMSUNG=m CONFIG_HID_SAMSUNG=m
@ -6752,7 +6815,6 @@ CONFIG_USB_HSIC_USB3503=m
CONFIG_USB_HSIC_USB4604=m CONFIG_USB_HSIC_USB4604=m
CONFIG_USB_LINK_LAYER_TEST=m CONFIG_USB_LINK_LAYER_TEST=m
CONFIG_USB_CHAOSKEY=m CONFIG_USB_CHAOSKEY=m
CONFIG_UCSI=m
CONFIG_USB_ATM=m CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m CONFIG_USB_CXACRU=m
@ -6805,6 +6867,7 @@ CONFIG_USB_F_ACM=m
CONFIG_USB_F_SS_LB=m CONFIG_USB_F_SS_LB=m
CONFIG_USB_U_SERIAL=m CONFIG_USB_U_SERIAL=m
CONFIG_USB_U_ETHER=m CONFIG_USB_U_ETHER=m
CONFIG_USB_U_AUDIO=m
CONFIG_USB_F_SERIAL=m CONFIG_USB_F_SERIAL=m
CONFIG_USB_F_OBEX=m CONFIG_USB_F_OBEX=m
CONFIG_USB_F_NCM=m CONFIG_USB_F_NCM=m
@ -6836,6 +6899,7 @@ CONFIG_USB_CONFIGFS_MASS_STORAGE=y
CONFIG_USB_CONFIGFS_F_LB_SS=y CONFIG_USB_CONFIGFS_F_LB_SS=y
CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_FS=y
CONFIG_USB_CONFIGFS_F_UAC1=y CONFIG_USB_CONFIGFS_F_UAC1=y
# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
CONFIG_USB_CONFIGFS_F_UAC2=y CONFIG_USB_CONFIGFS_F_UAC2=y
CONFIG_USB_CONFIGFS_F_MIDI=y CONFIG_USB_CONFIGFS_F_MIDI=y
CONFIG_USB_CONFIGFS_F_HID=y CONFIG_USB_CONFIGFS_F_HID=y
@ -6845,6 +6909,7 @@ CONFIG_USB_CONFIGFS_F_PRINTER=y
CONFIG_USB_ZERO=m CONFIG_USB_ZERO=m
CONFIG_USB_AUDIO=m CONFIG_USB_AUDIO=m
CONFIG_GADGET_UAC1=y CONFIG_GADGET_UAC1=y
# CONFIG_GADGET_UAC1_LEGACY is not set
CONFIG_USB_ETH=m CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y CONFIG_USB_ETH_RNDIS=y
CONFIG_USB_ETH_EEM=y CONFIG_USB_ETH_EEM=y
@ -6873,6 +6938,8 @@ CONFIG_USB_G_WEBCAM=m
# USB Power Delivery and Type-C drivers # USB Power Delivery and Type-C drivers
# #
CONFIG_TYPEC=m CONFIG_TYPEC=m
CONFIG_TYPEC_UCSI=m
CONFIG_UCSI_ACPI=m
CONFIG_USB_LED_TRIG=y CONFIG_USB_LED_TRIG=y
CONFIG_USB_ULPI_BUS=m CONFIG_USB_ULPI_BUS=m
CONFIG_UWB=m CONFIG_UWB=m
@ -6883,7 +6950,6 @@ CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set # CONFIG_MMC_DEBUG is not set
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_BLOCK_BOUNCE=y
CONFIG_SDIO_UART=m CONFIG_SDIO_UART=m
# CONFIG_MMC_TEST is not set # CONFIG_MMC_TEST is not set
@ -7065,6 +7131,7 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
CONFIG_RTC_SYSTOHC=y CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_SYSTOHC_DEVICE="rtc0" CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set # CONFIG_RTC_DEBUG is not set
CONFIG_RTC_NVMEM=y
# #
# RTC interfaces # RTC interfaces
@ -7143,6 +7210,7 @@ CONFIG_RTC_I2C_AND_SPI=y
# SPI and I2C RTC drivers # SPI and I2C RTC drivers
# #
CONFIG_RTC_DRV_DS3232=m CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_DS3232_HWMON=y
CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF2127=m
CONFIG_RTC_DRV_RV3029C2=m CONFIG_RTC_DRV_RV3029C2=m
CONFIG_RTC_DRV_RV3029_HWMON=y CONFIG_RTC_DRV_RV3029_HWMON=y
@ -7184,6 +7252,7 @@ CONFIG_RTC_DRV_AB3100=m
# #
# on-CPU RTC drivers # on-CPU RTC drivers
# #
CONFIG_RTC_DRV_FTRTC010=m
CONFIG_RTC_DRV_PCAP=m CONFIG_RTC_DRV_PCAP=m
CONFIG_RTC_DRV_MC13XXX=m CONFIG_RTC_DRV_MC13XXX=m
CONFIG_RTC_DRV_MT6397=m CONFIG_RTC_DRV_MT6397=m
@ -7518,7 +7587,6 @@ CONFIG_AD5933=m
# #
# Light sensors # Light sensors
# #
CONFIG_SENSORS_ISL29028=m
CONFIG_TSL2x7x=m CONFIG_TSL2x7x=m
# #
@ -7644,6 +7712,7 @@ CONFIG_KS7010=m
CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TCPM=m
CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPCI=m
CONFIG_TYPEC_FUSB302=m CONFIG_TYPEC_FUSB302=m
CONFIG_DRM_VBOXVIDEO=m
CONFIG_X86_PLATFORM_DEVICES=y CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m CONFIG_ACERHDF=m
@ -7657,7 +7726,6 @@ CONFIG_DELL_WMI_LED=m
CONFIG_DELL_SMO8800=m CONFIG_DELL_SMO8800=m
CONFIG_DELL_RBTN=m CONFIG_DELL_RBTN=m
CONFIG_FUJITSU_LAPTOP=m CONFIG_FUJITSU_LAPTOP=m
# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
CONFIG_FUJITSU_TABLET=m CONFIG_FUJITSU_TABLET=m
CONFIG_AMILO_RFKILL=m CONFIG_AMILO_RFKILL=m
CONFIG_TC1100_WMI=m CONFIG_TC1100_WMI=m
@ -7686,7 +7754,9 @@ CONFIG_ASUS_NB_WMI=m
CONFIG_EEEPC_WMI=m CONFIG_EEEPC_WMI=m
CONFIG_ASUS_WIRELESS=m CONFIG_ASUS_WIRELESS=m
CONFIG_ACPI_WMI=m CONFIG_ACPI_WMI=m
CONFIG_WMI_BMOF=m
CONFIG_MSI_WMI=m CONFIG_MSI_WMI=m
CONFIG_PEAQ_WMI=m
CONFIG_TOPSTAR_LAPTOP=m CONFIG_TOPSTAR_LAPTOP=m
CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_TOSHIBA=m
CONFIG_TOSHIBA_BT_RFKILL=m CONFIG_TOSHIBA_BT_RFKILL=m
@ -7694,6 +7764,7 @@ CONFIG_TOSHIBA_HAPS=m
CONFIG_TOSHIBA_WMI=m CONFIG_TOSHIBA_WMI=m
CONFIG_ACPI_CMPC=m CONFIG_ACPI_CMPC=m
CONFIG_INTEL_CHT_INT33FE=m CONFIG_INTEL_CHT_INT33FE=m
CONFIG_INTEL_INT0002_VGPIO=m
CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_HID_EVENT=m
CONFIG_INTEL_VBTN=m CONFIG_INTEL_VBTN=m
CONFIG_INTEL_SCU_IPC=y CONFIG_INTEL_SCU_IPC=y
@ -7724,6 +7795,7 @@ CONFIG_CHROMEOS_LAPTOP=m
CONFIG_CHROMEOS_PSTORE=m CONFIG_CHROMEOS_PSTORE=m
CONFIG_CROS_EC_CHARDEV=m CONFIG_CROS_EC_CHARDEV=m
CONFIG_CROS_EC_LPC=m CONFIG_CROS_EC_LPC=m
# CONFIG_CROS_EC_LPC_MEC is not set
CONFIG_CROS_EC_PROTO=y CONFIG_CROS_EC_PROTO=y
CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROS_KBD_LED_BACKLIGHT=m
CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKDEV_LOOKUP=y
@ -7744,10 +7816,7 @@ CONFIG_COMMON_CLK_PALMAS=m
CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_PWM=m
# CONFIG_COMMON_CLK_PXA is not set # CONFIG_COMMON_CLK_PXA is not set
# CONFIG_COMMON_CLK_PIC32 is not set # CONFIG_COMMON_CLK_PIC32 is not set
CONFIG_HWSPINLOCK=m
#
# Hardware Spinlock drivers
#
# #
# Clock Source drivers # Clock Source drivers
@ -7786,6 +7855,9 @@ CONFIG_REMOTEPROC=m
# #
# Rpmsg drivers # Rpmsg drivers
# #
CONFIG_RPMSG=m
# CONFIG_RPMSG_CHAR is not set
CONFIG_RPMSG_QCOM_GLINK_RPM=m
# #
# SOC (System On Chip) specific Drivers # SOC (System On Chip) specific Drivers
@ -7800,7 +7872,6 @@ CONFIG_REMOTEPROC=m
# #
# CONFIG_SUNXI_SRAM is not set # CONFIG_SUNXI_SRAM is not set
CONFIG_SOC_TI=y CONFIG_SOC_TI=y
# CONFIG_SOC_ZTE is not set
CONFIG_PM_DEVFREQ=y CONFIG_PM_DEVFREQ=y
# #
@ -7826,13 +7897,13 @@ CONFIG_EXTCON_ARIZONA=m
CONFIG_EXTCON_AXP288=m CONFIG_EXTCON_AXP288=m
CONFIG_EXTCON_GPIO=m CONFIG_EXTCON_GPIO=m
CONFIG_EXTCON_INTEL_INT3496=m CONFIG_EXTCON_INTEL_INT3496=m
CONFIG_EXTCON_INTEL_CHT_WC=m
CONFIG_EXTCON_MAX14577=m CONFIG_EXTCON_MAX14577=m
CONFIG_EXTCON_MAX3355=m CONFIG_EXTCON_MAX3355=m
CONFIG_EXTCON_MAX77693=m CONFIG_EXTCON_MAX77693=m
CONFIG_EXTCON_MAX77843=m CONFIG_EXTCON_MAX77843=m
CONFIG_EXTCON_MAX8997=m CONFIG_EXTCON_MAX8997=m
CONFIG_EXTCON_PALMAS=m CONFIG_EXTCON_PALMAS=m
CONFIG_EXTCON_QCOM_SPMI_MISC=m
CONFIG_EXTCON_RT8973A=m CONFIG_EXTCON_RT8973A=m
CONFIG_EXTCON_SM5502=m CONFIG_EXTCON_SM5502=m
CONFIG_EXTCON_USB_GPIO=m CONFIG_EXTCON_USB_GPIO=m
@ -7923,7 +7994,9 @@ CONFIG_QCOM_SPMI_IADC=m
CONFIG_QCOM_SPMI_VADC=m CONFIG_QCOM_SPMI_VADC=m
CONFIG_TI_ADC081C=m CONFIG_TI_ADC081C=m
CONFIG_TI_ADC0832=m CONFIG_TI_ADC0832=m
CONFIG_TI_ADC084S021=m
CONFIG_TI_ADC12138=m CONFIG_TI_ADC12138=m
CONFIG_TI_ADC108S102=m
CONFIG_TI_ADC128S052=m CONFIG_TI_ADC128S052=m
CONFIG_TI_ADC161S626=m CONFIG_TI_ADC161S626=m
CONFIG_TI_ADS1015=m CONFIG_TI_ADS1015=m
@ -8097,6 +8170,7 @@ CONFIG_CM36651=m
CONFIG_IIO_CROS_EC_LIGHT_PROX=m CONFIG_IIO_CROS_EC_LIGHT_PROX=m
CONFIG_GP2AP020A00F=m CONFIG_GP2AP020A00F=m
CONFIG_SENSORS_ISL29018=m CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_ISL29028=m
CONFIG_ISL29125=m CONFIG_ISL29125=m
CONFIG_HID_SENSOR_ALS=m CONFIG_HID_SENSOR_ALS=m
CONFIG_HID_SENSOR_PROX=m CONFIG_HID_SENSOR_PROX=m
@ -8137,6 +8211,10 @@ CONFIG_SENSORS_HMC5843=m
CONFIG_SENSORS_HMC5843_I2C=m CONFIG_SENSORS_HMC5843_I2C=m
CONFIG_SENSORS_HMC5843_SPI=m CONFIG_SENSORS_HMC5843_SPI=m
#
# Multiplexers
#
# #
# Inclinometer sensors # Inclinometer sensors
# #
@ -8217,6 +8295,7 @@ CONFIG_TMP007=m
CONFIG_TSYS01=m CONFIG_TSYS01=m
CONFIG_TSYS02D=m CONFIG_TSYS02D=m
CONFIG_NTB=m CONFIG_NTB=m
CONFIG_NTB_IDT=m
CONFIG_NTB_PINGPONG=m CONFIG_NTB_PINGPONG=m
CONFIG_NTB_TOOL=m CONFIG_NTB_TOOL=m
CONFIG_NTB_PERF=m CONFIG_NTB_PERF=m
@ -8258,6 +8337,7 @@ CONFIG_SERIAL_IPOCTAL=m
CONFIG_RESET_CONTROLLER=y CONFIG_RESET_CONTROLLER=y
# CONFIG_RESET_ATH79 is not set # CONFIG_RESET_ATH79 is not set
# CONFIG_RESET_BERLIN is not set # CONFIG_RESET_BERLIN is not set
# CONFIG_RESET_GEMINI is not set
# CONFIG_RESET_IMX7 is not set # CONFIG_RESET_IMX7 is not set
# CONFIG_RESET_LPC18XX is not set # CONFIG_RESET_LPC18XX is not set
# CONFIG_RESET_MESON is not set # CONFIG_RESET_MESON is not set
@ -8265,7 +8345,7 @@ CONFIG_RESET_CONTROLLER=y
# CONFIG_RESET_SOCFPGA is not set # CONFIG_RESET_SOCFPGA is not set
# CONFIG_RESET_STM32 is not set # CONFIG_RESET_STM32 is not set
# CONFIG_RESET_SUNXI is not set # CONFIG_RESET_SUNXI is not set
CONFIG_TI_SYSCON_RESET=m CONFIG_RESET_TI_SYSCON=m
# CONFIG_RESET_ZYNQ is not set # CONFIG_RESET_ZYNQ is not set
# CONFIG_RESET_TEGRA_BPMP is not set # CONFIG_RESET_TEGRA_BPMP is not set
CONFIG_FMC=m CONFIG_FMC=m
@ -8278,15 +8358,16 @@ CONFIG_FMC_CHARDEV=m
# PHY Subsystem # PHY Subsystem
# #
CONFIG_GENERIC_PHY=y CONFIG_GENERIC_PHY=y
CONFIG_BCM_KONA_USB2_PHY=m
CONFIG_PHY_PXA_28NM_HSIC=m CONFIG_PHY_PXA_28NM_HSIC=m
CONFIG_PHY_PXA_28NM_USB2=m CONFIG_PHY_PXA_28NM_USB2=m
CONFIG_BCM_KONA_USB2_PHY=m CONFIG_PHY_CPCAP_USB=m
CONFIG_PHY_QCOM_USB_HS=m
CONFIG_PHY_QCOM_USB_HSIC=m
CONFIG_PHY_SAMSUNG_USB2=m CONFIG_PHY_SAMSUNG_USB2=m
# CONFIG_PHY_EXYNOS4210_USB2 is not set # CONFIG_PHY_EXYNOS4210_USB2 is not set
# CONFIG_PHY_EXYNOS4X12_USB2 is not set # CONFIG_PHY_EXYNOS4X12_USB2 is not set
# CONFIG_PHY_EXYNOS5250_USB2 is not set # CONFIG_PHY_EXYNOS5250_USB2 is not set
CONFIG_PHY_QCOM_USB_HS=m
CONFIG_PHY_QCOM_USB_HSIC=m
CONFIG_PHY_TUSB1210=m CONFIG_PHY_TUSB1210=m
CONFIG_POWERCAP=y CONFIG_POWERCAP=y
CONFIG_INTEL_RAPL=m CONFIG_INTEL_RAPL=m
@ -8298,7 +8379,6 @@ CONFIG_MCB_LPC=m
# Performance monitor support # Performance monitor support
# #
CONFIG_RAS=y CONFIG_RAS=y
# CONFIG_MCE_AMD_INJ is not set
CONFIG_THUNDERBOLT=m CONFIG_THUNDERBOLT=m
# #
@ -8313,7 +8393,7 @@ CONFIG_ND_BTT=m
CONFIG_BTT=y CONFIG_BTT=y
CONFIG_DAX=y CONFIG_DAX=y
CONFIG_DEV_DAX=m CONFIG_DEV_DAX=m
CONFIG_NVMEM=m CONFIG_NVMEM=y
CONFIG_STM=m CONFIG_STM=m
CONFIG_STM_DUMMY=m CONFIG_STM_DUMMY=m
CONFIG_STM_SOURCE_CONSOLE=m CONFIG_STM_SOURCE_CONSOLE=m
@ -8367,7 +8447,8 @@ CONFIG_EFI_RUNTIME_MAP=y
# CONFIG_EFI_FAKE_MEMMAP is not set # CONFIG_EFI_FAKE_MEMMAP is not set
CONFIG_EFI_RUNTIME_WRAPPERS=y CONFIG_EFI_RUNTIME_WRAPPERS=y
CONFIG_EFI_BOOTLOADER_CONTROL=m CONFIG_EFI_BOOTLOADER_CONTROL=m
# CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CAPSULE_LOADER=y
CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
# CONFIG_EFI_TEST is not set # CONFIG_EFI_TEST is not set
CONFIG_APPLE_PROPERTIES=y CONFIG_APPLE_PROPERTIES=y
CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER=y
@ -8459,6 +8540,7 @@ CONFIG_FUSE_FS=y
CONFIG_CUSE=m CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
# CONFIG_OVERLAY_FS_INDEX is not set
# #
# Caches # Caches
@ -8646,8 +8728,8 @@ CONFIG_CIFS_POSIX=y
CONFIG_CIFS_ACL=y CONFIG_CIFS_ACL=y
CONFIG_CIFS_DEBUG=y CONFIG_CIFS_DEBUG=y
# CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DEBUG2 is not set
# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_DFS_UPCALL=y
CONFIG_CIFS_SMB2=y
CONFIG_CIFS_SMB311=y CONFIG_CIFS_SMB311=y
CONFIG_CIFS_FSCACHE=y CONFIG_CIFS_FSCACHE=y
CONFIG_NCP_FS=m CONFIG_NCP_FS=m
@ -8788,6 +8870,8 @@ CONFIG_HAVE_ARCH_KMEMCHECK=y
# Debug Lockups and Hangs # Debug Lockups and Hangs
# #
CONFIG_LOCKUP_DETECTOR=y CONFIG_LOCKUP_DETECTOR=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_HARDLOCKUP_DETECTOR_PERF=y
CONFIG_HARDLOCKUP_DETECTOR=y CONFIG_HARDLOCKUP_DETECTOR=y
# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
@ -8822,6 +8906,7 @@ CONFIG_SCHED_STACK_END_CHECK=y
CONFIG_LOCK_TORTURE_TEST=m CONFIG_LOCK_TORTURE_TEST=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_STACKTRACE=y CONFIG_STACKTRACE=y
# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
# CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_LIST is not set
@ -8834,7 +8919,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
# RCU Debugging # RCU Debugging
# #
# CONFIG_PROVE_RCU is not set # CONFIG_PROVE_RCU is not set
# CONFIG_SPARSE_RCU_POINTER is not set
CONFIG_TORTURE_TEST=m CONFIG_TORTURE_TEST=m
# CONFIG_RCU_PERF_TEST is not set # CONFIG_RCU_PERF_TEST is not set
# CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set
@ -8897,7 +8981,7 @@ CONFIG_MMIOTRACE=y
# CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_TRACEPOINT_BENCHMARK is not set
# CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_RING_BUFFER_BENCHMARK is not set
# CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set
# CONFIG_TRACE_ENUM_MAP_FILE is not set # CONFIG_TRACE_EVAL_MAP_FILE is not set
CONFIG_TRACING_EVENTS_GPIO=y CONFIG_TRACING_EVENTS_GPIO=y
# #
@ -8928,10 +9012,12 @@ CONFIG_TEST_LKM=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
# CONFIG_TEST_SYSCTL is not set
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
CONFIG_MEMTEST=y CONFIG_MEMTEST=y
CONFIG_TEST_STATIC_KEYS=m CONFIG_TEST_STATIC_KEYS=m
# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_BUG_ON_DATA_CORRUPTION is not set
# CONFIG_TEST_KMOD is not set
# CONFIG_SAMPLES is not set # CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_KGDB=y
CONFIG_KGDB=y CONFIG_KGDB=y
@ -8994,6 +9080,7 @@ CONFIG_SECURITY=y
CONFIG_SECURITY_WRITABLE_HOOKS=y CONFIG_SECURITY_WRITABLE_HOOKS=y
CONFIG_SECURITYFS=y CONFIG_SECURITYFS=y
CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_INFINIBAND is not set
CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y CONFIG_SECURITY_PATH=y
CONFIG_INTEL_TXT=y CONFIG_INTEL_TXT=y
@ -9001,6 +9088,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=0
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
CONFIG_FORTIFY_SOURCE=y
# CONFIG_STATIC_USERMODEHELPER is not set # CONFIG_STATIC_USERMODEHELPER is not set
CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y
@ -9040,12 +9128,11 @@ CONFIG_IMA_NG_TEMPLATE=y
CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng" CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
CONFIG_IMA_DEFAULT_HASH_SHA1=y CONFIG_IMA_DEFAULT_HASH_SHA1=y
# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set # CONFIG_IMA_DEFAULT_HASH_SHA256 is not set
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DEFAULT_HASH_WP512 is not set
CONFIG_IMA_DEFAULT_HASH="sha1" CONFIG_IMA_DEFAULT_HASH="sha1"
# CONFIG_IMA_WRITE_POLICY is not set # CONFIG_IMA_WRITE_POLICY is not set
# CONFIG_IMA_READ_POLICY is not set # CONFIG_IMA_READ_POLICY is not set
CONFIG_IMA_APPRAISE=y CONFIG_IMA_APPRAISE=y
CONFIG_IMA_APPRAISE_BOOTPARAM=y
CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_TRUSTED_KEYRING=y
CONFIG_IMA_BLACKLIST_KEYRING=y CONFIG_IMA_BLACKLIST_KEYRING=y
# CONFIG_IMA_LOAD_X509 is not set # CONFIG_IMA_LOAD_X509 is not set
@ -9295,6 +9382,7 @@ CONFIG_CRC32_SLICEBY8=y
# CONFIG_CRC32_SLICEBY4 is not set # CONFIG_CRC32_SLICEBY4 is not set
# CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_SARWATE is not set
# CONFIG_CRC32_BIT is not set # CONFIG_CRC32_BIT is not set
# CONFIG_CRC4 is not set
CONFIG_CRC7=m CONFIG_CRC7=m
CONFIG_LIBCRC32C=m CONFIG_LIBCRC32C=m
CONFIG_CRC8=m CONFIG_CRC8=m

191
gnu/packages/aux-files/linux-libre/4.12-x86_64.conf → gnu/packages/aux-files/linux-libre/4.13-x86_64.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 4.12.0-gnu Kernel Configuration # Linux/x86 4.13.0-gnu Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -87,7 +87,9 @@ CONFIG_AUDIT_TREE=y
# #
CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
CONFIG_GENERIC_PENDING_IRQ=y CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_GENERIC_IRQ_MIGRATION=y
CONFIG_GENERIC_IRQ_CHIP=y CONFIG_GENERIC_IRQ_CHIP=y
CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN=y
CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_IRQ_DOMAIN_HIERARCHY=y
@ -96,6 +98,7 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
# CONFIG_IRQ_DOMAIN_DEBUG is not set # CONFIG_IRQ_DOMAIN_DEBUG is not set
CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y CONFIG_SPARSE_IRQ=y
# CONFIG_GENERIC_IRQ_DEBUGFS is not set
CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_ARCH_CLOCKSOURCE_DATA=y
CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
@ -139,7 +142,6 @@ CONFIG_TREE_SRCU=y
# CONFIG_TASKS_RCU is not set # CONFIG_TASKS_RCU is not set
CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_RCU_NEED_SEGCBLIST=y
# CONFIG_TREE_RCU_TRACE is not set
CONFIG_BUILD_BIN2C=y CONFIG_BUILD_BIN2C=y
# CONFIG_IKCONFIG is not set # CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=18 CONFIG_LOG_BUF_SHIFT=18
@ -246,6 +248,7 @@ CONFIG_SLUB_DEBUG=y
# CONFIG_SLAB is not set # CONFIG_SLAB is not set
CONFIG_SLUB=y CONFIG_SLUB=y
# CONFIG_SLOB is not set # CONFIG_SLOB is not set
CONFIG_SLAB_MERGE_DEFAULT=y
CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_RANDOM=y
CONFIG_SLUB_CPU_PARTIAL=y CONFIG_SLUB_CPU_PARTIAL=y
# CONFIG_SYSTEM_DATA_VERIFICATION is not set # CONFIG_SYSTEM_DATA_VERIFICATION is not set
@ -277,6 +280,7 @@ CONFIG_HAVE_NMI=y
CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_MEMORY=y
CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
@ -286,6 +290,7 @@ CONFIG_HAVE_HW_BREAKPOINT=y
CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y
CONFIG_HAVE_PERF_EVENTS_NMI=y CONFIG_HAVE_PERF_EVENTS_NMI=y
CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_REGS=y
CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_JUMP_LABEL=y
@ -302,11 +307,13 @@ CONFIG_GCC_PLUGINS=y
# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set # CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_HAVE_CC_STACKPROTECTOR=y
CONFIG_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y
# CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_NONE is not set
# CONFIG_CC_STACKPROTECTOR_REGULAR is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_CC_STACKPROTECTOR_STRONG=y
CONFIG_THIN_ARCHIVES=y
CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
@ -339,6 +346,7 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
CONFIG_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y
CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
CONFIG_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y
CONFIG_REFCOUNT_FULL=y
# #
# GCOV-based kernel profiling # GCOV-based kernel profiling
@ -517,6 +525,7 @@ CONFIG_X86_MCE=y
CONFIG_X86_MCE_INTEL=y CONFIG_X86_MCE_INTEL=y
CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_AMD=y
CONFIG_X86_MCE_THRESHOLD=y CONFIG_X86_MCE_THRESHOLD=y
# CONFIG_X86_MCE_INJECT is not set
CONFIG_X86_THERMAL_VECTOR=y CONFIG_X86_THERMAL_VECTOR=y
# #
@ -563,9 +572,9 @@ CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
CONFIG_HAVE_GENERIC_GUP=y
CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_ARCH_DISCARD_MEMBLOCK=y
CONFIG_MEMORY_ISOLATION=y CONFIG_MEMORY_ISOLATION=y
CONFIG_MOVABLE_NODE=y
CONFIG_HAVE_BOOTMEM_INFO_NODE=y CONFIG_HAVE_BOOTMEM_INFO_NODE=y
CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_MEMORY_HOTPLUG_SPARSE=y
@ -589,6 +598,8 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
CONFIG_ARCH_WANTS_THP_SWAP=y
CONFIG_THP_SWAP=y
CONFIG_TRANSPARENT_HUGE_PAGECACHE=y CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
CONFIG_CLEANCACHE=y CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y CONFIG_FRONTSWAP=y
@ -608,10 +619,12 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
CONFIG_IDLE_PAGE_TRACKING=y CONFIG_IDLE_PAGE_TRACKING=y
CONFIG_ARCH_HAS_ZONE_DEVICE=y
CONFIG_ZONE_DEVICE=y CONFIG_ZONE_DEVICE=y
CONFIG_FRAME_VECTOR=y CONFIG_FRAME_VECTOR=y
CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
CONFIG_ARCH_HAS_PKEYS=y CONFIG_ARCH_HAS_PKEYS=y
# CONFIG_PERCPU_STATS is not set
CONFIG_X86_PMEM_LEGACY_DEVICE=y CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=y CONFIG_X86_PMEM_LEGACY=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@ -824,6 +837,7 @@ CONFIG_PCI_STUB=m
CONFIG_XEN_PCIDEV_FRONTEND=m CONFIG_XEN_PCIDEV_FRONTEND=m
CONFIG_HT_IRQ=y CONFIG_HT_IRQ=y
CONFIG_PCI_ATS=y CONFIG_PCI_ATS=y
CONFIG_PCI_LOCKLESS_CONFIG=y
CONFIG_PCI_IOV=y CONFIG_PCI_IOV=y
CONFIG_PCI_PRI=y CONFIG_PCI_PRI=y
CONFIG_PCI_PASID=y CONFIG_PCI_PASID=y
@ -927,6 +941,7 @@ CONFIG_PACKET=y
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m CONFIG_UNIX_DIAG=m
CONFIG_TLS=m
CONFIG_XFRM=y CONFIG_XFRM=y
CONFIG_XFRM_OFFLOAD=y CONFIG_XFRM_OFFLOAD=y
CONFIG_XFRM_ALGO=m CONFIG_XFRM_ALGO=m
@ -1435,10 +1450,11 @@ CONFIG_HAVE_NET_DSA=y
CONFIG_NET_DSA=m CONFIG_NET_DSA=m
CONFIG_NET_DSA_TAG_DSA=y CONFIG_NET_DSA_TAG_DSA=y
CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_DSA_TAG_EDSA=y
CONFIG_NET_DSA_TAG_KSZ=y
CONFIG_NET_DSA_TAG_LAN9303=y
CONFIG_NET_DSA_TAG_MTK=y
CONFIG_NET_DSA_TAG_TRAILER=y CONFIG_NET_DSA_TAG_TRAILER=y
CONFIG_NET_DSA_TAG_QCA=y CONFIG_NET_DSA_TAG_QCA=y
CONFIG_NET_DSA_TAG_MTK=y
CONFIG_NET_DSA_TAG_LAN9303=y
CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_GVRP=y
CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLAN_8021Q_MVRP=y
@ -1946,6 +1962,10 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_CMDLINE_PARTS=m
CONFIG_MTD_AR7_PARTS=m CONFIG_MTD_AR7_PARTS=m
#
# Partition parsers
#
# #
# User Modules And Translation Layers # User Modules And Translation Layers
# #
@ -2020,6 +2040,7 @@ CONFIG_MTD_DATAFLASH=m
# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
CONFIG_MTD_DATAFLASH_OTP=y CONFIG_MTD_DATAFLASH_OTP=y
CONFIG_MTD_M25P80=m CONFIG_MTD_M25P80=m
CONFIG_MTD_MCHP23K256=m
CONFIG_MTD_SST25L=m CONFIG_MTD_SST25L=m
CONFIG_MTD_SLRAM=m CONFIG_MTD_SLRAM=m
CONFIG_MTD_PHRAM=m CONFIG_MTD_PHRAM=m
@ -2053,8 +2074,6 @@ CONFIG_MTD_NAND_DOCG4=m
CONFIG_MTD_NAND_CAFE=m CONFIG_MTD_NAND_CAFE=m
CONFIG_MTD_NAND_NANDSIM=m CONFIG_MTD_NAND_NANDSIM=m
CONFIG_MTD_NAND_PLATFORM=m CONFIG_MTD_NAND_PLATFORM=m
CONFIG_MTD_NAND_HISI504=m
CONFIG_MTD_NAND_MTK=m
CONFIG_MTD_ONENAND=m CONFIG_MTD_ONENAND=m
CONFIG_MTD_ONENAND_VERIFY_WRITE=y CONFIG_MTD_ONENAND_VERIFY_WRITE=y
CONFIG_MTD_ONENAND_GENERIC=m CONFIG_MTD_ONENAND_GENERIC=m
@ -2159,7 +2178,6 @@ CONFIG_BLK_DEV_RBD=m
CONFIG_BLK_DEV_RSXX=m CONFIG_BLK_DEV_RSXX=m
CONFIG_NVME_CORE=m CONFIG_NVME_CORE=m
CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_NVME=m
# CONFIG_BLK_DEV_NVME_SCSI is not set
CONFIG_NVME_FABRICS=m CONFIG_NVME_FABRICS=m
CONFIG_NVME_RDMA=m CONFIG_NVME_RDMA=m
CONFIG_NVME_FC=m CONFIG_NVME_FC=m
@ -2276,6 +2294,7 @@ CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
CONFIG_ECHO=m CONFIG_ECHO=m
# CONFIG_CXL_BASE is not set # CONFIG_CXL_BASE is not set
# CONFIG_CXL_AFU_DRIVER_OPS is not set # CONFIG_CXL_AFU_DRIVER_OPS is not set
# CONFIG_CXL_LIB is not set
CONFIG_HAVE_IDE=y CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set # CONFIG_IDE is not set
@ -2575,6 +2594,7 @@ CONFIG_DM_VERITY=m
CONFIG_DM_SWITCH=m CONFIG_DM_SWITCH=m
CONFIG_DM_LOG_WRITES=m CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m CONFIG_DM_INTEGRITY=m
CONFIG_DM_ZONED=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m CONFIG_TCM_FILEIO=m
@ -2697,17 +2717,19 @@ CONFIG_CAIF_VIRTIO=m
# #
# Distributed Switch Architecture drivers # Distributed Switch Architecture drivers
# #
CONFIG_NET_DSA_MV88E6060=m
CONFIG_B53=m CONFIG_B53=m
CONFIG_B53_SPI_DRIVER=m CONFIG_B53_SPI_DRIVER=m
CONFIG_B53_MDIO_DRIVER=m CONFIG_B53_MDIO_DRIVER=m
CONFIG_B53_MMAP_DRIVER=m CONFIG_B53_MMAP_DRIVER=m
CONFIG_B53_SRAB_DRIVER=m CONFIG_B53_SRAB_DRIVER=m
# CONFIG_NET_DSA_LOOP is not set
CONFIG_NET_DSA_MT7530=m
CONFIG_NET_DSA_MV88E6060=m
CONFIG_MICROCHIP_KSZ=m
CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m
CONFIG_NET_DSA_MV88E6XXX=m CONFIG_NET_DSA_MV88E6XXX=m
CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
CONFIG_NET_DSA_QCA8K=m CONFIG_NET_DSA_QCA8K=m
# CONFIG_NET_DSA_LOOP is not set
CONFIG_NET_DSA_MT7530=m
CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303=m
CONFIG_NET_DSA_SMSC_LAN9303_I2C=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
@ -2750,6 +2772,7 @@ CONFIG_NET_VENDOR_AURORA=y
CONFIG_AURORA_NB8800=m CONFIG_AURORA_NB8800=m
CONFIG_NET_CADENCE=y CONFIG_NET_CADENCE=y
CONFIG_MACB=m CONFIG_MACB=m
CONFIG_MACB_USE_HWSTAMP=y
CONFIG_MACB_PCI=m CONFIG_MACB_PCI=m
CONFIG_NET_VENDOR_BROADCOM=y CONFIG_NET_VENDOR_BROADCOM=y
CONFIG_B44=m CONFIG_B44=m
@ -2851,6 +2874,7 @@ CONFIG_MLX4_EN_DCB=y
CONFIG_MLX4_CORE=m CONFIG_MLX4_CORE=m
CONFIG_MLX4_DEBUG=y CONFIG_MLX4_DEBUG=y
CONFIG_MLX5_CORE=m CONFIG_MLX5_CORE=m
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN_DCB=y
# CONFIG_MLX5_CORE_IPOIB is not set # CONFIG_MLX5_CORE_IPOIB is not set
@ -2864,6 +2888,7 @@ CONFIG_MLXSW_SWITCHX2=m
CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SPECTRUM=m
CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM_DCB=y
CONFIG_MLXSW_MINIMAL=m CONFIG_MLXSW_MINIMAL=m
CONFIG_MLXFW=m
CONFIG_NET_VENDOR_MICREL=y CONFIG_NET_VENDOR_MICREL=y
CONFIG_KS8842=m CONFIG_KS8842=m
CONFIG_KS8851=m CONFIG_KS8851=m
@ -2882,6 +2907,7 @@ CONFIG_NATSEMI=m
CONFIG_NS83820=m CONFIG_NS83820=m
CONFIG_NET_VENDOR_NETRONOME=y CONFIG_NET_VENDOR_NETRONOME=y
CONFIG_NFP=m CONFIG_NFP=m
# CONFIG_NFP_APP_FLOWER is not set
# CONFIG_NFP_DEBUG is not set # CONFIG_NFP_DEBUG is not set
CONFIG_NET_VENDOR_8390=y CONFIG_NET_VENDOR_8390=y
CONFIG_PCMCIA_AXNET=m CONFIG_PCMCIA_AXNET=m
@ -2985,6 +3011,7 @@ CONFIG_SKFP=m
# CONFIG_HIPPI is not set # CONFIG_HIPPI is not set
CONFIG_NET_SB1000=m CONFIG_NET_SB1000=m
CONFIG_MDIO_DEVICE=y CONFIG_MDIO_DEVICE=y
CONFIG_MDIO_BUS=y
CONFIG_MDIO_BITBANG=m CONFIG_MDIO_BITBANG=m
CONFIG_MDIO_CAVIUM=m CONFIG_MDIO_CAVIUM=m
CONFIG_MDIO_GPIO=m CONFIG_MDIO_GPIO=m
@ -3004,6 +3031,7 @@ CONFIG_BCM87XX_PHY=m
CONFIG_BCM_NET_PHYLIB=m CONFIG_BCM_NET_PHYLIB=m
CONFIG_BROADCOM_PHY=m CONFIG_BROADCOM_PHY=m
CONFIG_CICADA_PHY=m CONFIG_CICADA_PHY=m
CONFIG_CORTINA_PHY=m
CONFIG_DAVICOM_PHY=m CONFIG_DAVICOM_PHY=m
CONFIG_DP83848_PHY=m CONFIG_DP83848_PHY=m
CONFIG_DP83867_PHY=m CONFIG_DP83867_PHY=m
@ -3013,6 +3041,7 @@ CONFIG_INTEL_XWAY_PHY=m
CONFIG_LSI_ET1011C_PHY=m CONFIG_LSI_ET1011C_PHY=m
CONFIG_LXT_PHY=m CONFIG_LXT_PHY=m
CONFIG_MARVELL_PHY=m CONFIG_MARVELL_PHY=m
CONFIG_MARVELL_10G_PHY=m
CONFIG_MICREL_PHY=m CONFIG_MICREL_PHY=m
CONFIG_MICROCHIP_PHY=m CONFIG_MICROCHIP_PHY=m
CONFIG_MICROSEMI_PHY=m CONFIG_MICROSEMI_PHY=m
@ -3131,6 +3160,7 @@ CONFIG_WIL6210_ISR_COR=y
CONFIG_WIL6210_TRACING=y CONFIG_WIL6210_TRACING=y
CONFIG_ATH10K=m CONFIG_ATH10K=m
CONFIG_ATH10K_PCI=m CONFIG_ATH10K_PCI=m
CONFIG_ATH10K_SDIO=m
# CONFIG_ATH10K_DEBUG is not set # CONFIG_ATH10K_DEBUG is not set
CONFIG_ATH10K_DEBUGFS=y CONFIG_ATH10K_DEBUGFS=y
CONFIG_ATH10K_TRACING=y CONFIG_ATH10K_TRACING=y
@ -3335,6 +3365,9 @@ CONFIG_WLAN_VENDOR_ZYDAS=y
CONFIG_USB_ZD1201=m CONFIG_USB_ZD1201=m
CONFIG_ZD1211RW=m CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set # CONFIG_ZD1211RW_DEBUG is not set
CONFIG_WLAN_VENDOR_QUANTENNA=y
CONFIG_QTNFMAC=m
CONFIG_QTNFMAC_PEARL_PCIE=m
CONFIG_PCMCIA_RAYCS=m CONFIG_PCMCIA_RAYCS=m
CONFIG_PCMCIA_WL3501=m CONFIG_PCMCIA_WL3501=m
CONFIG_MAC80211_HWSIM=m CONFIG_MAC80211_HWSIM=m
@ -3547,6 +3580,7 @@ CONFIG_KEYBOARD_ADP5589=m
CONFIG_KEYBOARD_ATKBD=y CONFIG_KEYBOARD_ATKBD=y
CONFIG_KEYBOARD_QT1070=m CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_QT2160=m CONFIG_KEYBOARD_QT2160=m
CONFIG_KEYBOARD_DLINK_DIR685=m
CONFIG_KEYBOARD_LKKBD=m CONFIG_KEYBOARD_LKKBD=m
CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_GPIO=m
CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_GPIO_POLLED=m
@ -3721,6 +3755,7 @@ CONFIG_TOUCHSCREEN_RM_TS=m
CONFIG_TOUCHSCREEN_SILEAD=m CONFIG_TOUCHSCREEN_SILEAD=m
CONFIG_TOUCHSCREEN_SIS_I2C=m CONFIG_TOUCHSCREEN_SIS_I2C=m
CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_TOUCHSCREEN_STMFTS=m
CONFIG_TOUCHSCREEN_SUR40=m CONFIG_TOUCHSCREEN_SUR40=m
CONFIG_TOUCHSCREEN_SURFACE3_SPI=m CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
CONFIG_TOUCHSCREEN_SX8654=m CONFIG_TOUCHSCREEN_SX8654=m
@ -3922,6 +3957,7 @@ CONFIG_HVC_XEN=y
CONFIG_HVC_XEN_FRONTEND=y CONFIG_HVC_XEN_FRONTEND=y
CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_CONSOLE=y
CONFIG_IPMI_HANDLER=m CONFIG_IPMI_HANDLER=m
CONFIG_IPMI_DMI_DECODE=y
# CONFIG_IPMI_PANIC_EVENT is not set # CONFIG_IPMI_PANIC_EVENT is not set
CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_DEVICE_INTERFACE=m
CONFIG_IPMI_SI=m CONFIG_IPMI_SI=m
@ -4034,8 +4070,9 @@ CONFIG_I2C_SCMI=m
# I2C system bus drivers (mostly embedded / system-on-chip) # I2C system bus drivers (mostly embedded / system-on-chip)
# #
CONFIG_I2C_CBUS_GPIO=m CONFIG_I2C_CBUS_GPIO=m
CONFIG_I2C_DESIGNWARE_CORE=m CONFIG_I2C_DESIGNWARE_CORE=y
CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_I2C_DESIGNWARE_PLATFORM=y
# CONFIG_I2C_DESIGNWARE_SLAVE is not set
CONFIG_I2C_DESIGNWARE_PCI=m CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_DESIGNWARE_BAYTRAIL=y CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
CONFIG_I2C_EMEV2=m CONFIG_I2C_EMEV2=m
@ -4104,6 +4141,7 @@ CONFIG_SPI_ZYNQMP_GQSPI=m
CONFIG_SPI_SPIDEV=m CONFIG_SPI_SPIDEV=m
# CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_TLE62X0=m CONFIG_SPI_TLE62X0=m
# CONFIG_SPI_SLAVE is not set
CONFIG_SPMI=m CONFIG_SPMI=m
CONFIG_HSI=m CONFIG_HSI=m
CONFIG_HSI_BOARDINFO=y CONFIG_HSI_BOARDINFO=y
@ -4116,10 +4154,6 @@ CONFIG_HSI_BOARDINFO=y
# HSI clients # HSI clients
# #
CONFIG_HSI_CHAR=m CONFIG_HSI_CHAR=m
#
# PPS support
#
CONFIG_PPS=m CONFIG_PPS=m
# CONFIG_PPS_DEBUG is not set # CONFIG_PPS_DEBUG is not set
@ -4154,11 +4188,13 @@ CONFIG_PINCONF=y
CONFIG_GENERIC_PINCONF=y CONFIG_GENERIC_PINCONF=y
# CONFIG_DEBUG_PINCTRL is not set # CONFIG_DEBUG_PINCTRL is not set
CONFIG_PINCTRL_AMD=y CONFIG_PINCTRL_AMD=y
CONFIG_PINCTRL_MCP23S08=m
CONFIG_PINCTRL_SX150X=y CONFIG_PINCTRL_SX150X=y
CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BAYTRAIL=y
CONFIG_PINCTRL_CHERRYVIEW=m CONFIG_PINCTRL_CHERRYVIEW=m
CONFIG_PINCTRL_INTEL=m CONFIG_PINCTRL_INTEL=m
CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_BROXTON=m
CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_GEMINILAKE=m CONFIG_PINCTRL_GEMINILAKE=m
CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_PINCTRL_SUNRISEPOINT=m
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
@ -4244,10 +4280,7 @@ CONFIG_GPIO_RDC321X=m
CONFIG_GPIO_MAX7301=m CONFIG_GPIO_MAX7301=m
CONFIG_GPIO_MC33880=m CONFIG_GPIO_MC33880=m
CONFIG_GPIO_PISOSR=m CONFIG_GPIO_PISOSR=m
CONFIG_GPIO_XRA1403=m
#
# SPI or I2C GPIO expanders
#
# #
# USB GPIO expanders # USB GPIO expanders
@ -4306,6 +4339,7 @@ CONFIG_BATTERY_SBS=m
CONFIG_CHARGER_SBS=m CONFIG_CHARGER_SBS=m
CONFIG_BATTERY_BQ27XXX=m CONFIG_BATTERY_BQ27XXX=m
CONFIG_BATTERY_BQ27XXX_I2C=m CONFIG_BATTERY_BQ27XXX_I2C=m
# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
CONFIG_BATTERY_DA9030=m CONFIG_BATTERY_DA9030=m
CONFIG_BATTERY_DA9052=m CONFIG_BATTERY_DA9052=m
CONFIG_CHARGER_DA9150=m CONFIG_CHARGER_DA9150=m
@ -4328,6 +4362,7 @@ CONFIG_CHARGER_LP8727=m
CONFIG_CHARGER_LP8788=m CONFIG_CHARGER_LP8788=m
CONFIG_CHARGER_GPIO=m CONFIG_CHARGER_GPIO=m
CONFIG_CHARGER_MANAGER=y CONFIG_CHARGER_MANAGER=y
CONFIG_CHARGER_LTC3651=m
CONFIG_CHARGER_MAX14577=m CONFIG_CHARGER_MAX14577=m
CONFIG_CHARGER_MAX77693=m CONFIG_CHARGER_MAX77693=m
CONFIG_CHARGER_MAX8997=m CONFIG_CHARGER_MAX8997=m
@ -4453,6 +4488,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_PMBUS=m CONFIG_PMBUS=m
CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_ADM1275=m CONFIG_SENSORS_ADM1275=m
CONFIG_SENSORS_IR35221=m
CONFIG_SENSORS_LM25066=m CONFIG_SENSORS_LM25066=m
CONFIG_SENSORS_LTC2978=m CONFIG_SENSORS_LTC2978=m
CONFIG_SENSORS_LTC2978_REGULATOR=y CONFIG_SENSORS_LTC2978_REGULATOR=y
@ -4551,6 +4587,7 @@ CONFIG_GENERIC_ADC_THERMAL=m
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set
CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
CONFIG_WATCHDOG_SYSFS=y CONFIG_WATCHDOG_SYSFS=y
# #
@ -4694,6 +4731,7 @@ CONFIG_LPC_ICH=m
CONFIG_LPC_SCH=m CONFIG_LPC_SCH=m
CONFIG_INTEL_SOC_PMIC=y CONFIG_INTEL_SOC_PMIC=y
CONFIG_INTEL_SOC_PMIC_BXTWC=m CONFIG_INTEL_SOC_PMIC_BXTWC=m
CONFIG_INTEL_SOC_PMIC_CHTWC=m
CONFIG_MFD_INTEL_LPSS=m CONFIG_MFD_INTEL_LPSS=m
CONFIG_MFD_INTEL_LPSS_ACPI=m CONFIG_MFD_INTEL_LPSS_ACPI=m
CONFIG_MFD_INTEL_LPSS_PCI=m CONFIG_MFD_INTEL_LPSS_PCI=m
@ -4885,6 +4923,7 @@ CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_TUNER=m
CONFIG_V4L2_MEM2MEM_DEV=m CONFIG_V4L2_MEM2MEM_DEV=m
CONFIG_V4L2_FLASH_LED_CLASS=m CONFIG_V4L2_FLASH_LED_CLASS=m
CONFIG_V4L2_FWNODE=m
CONFIG_VIDEOBUF_GEN=m CONFIG_VIDEOBUF_GEN=m
CONFIG_VIDEOBUF_DMA_SG=m CONFIG_VIDEOBUF_DMA_SG=m
CONFIG_VIDEOBUF_VMALLOC=m CONFIG_VIDEOBUF_VMALLOC=m
@ -5206,6 +5245,7 @@ CONFIG_VIDEO_VIVID_MAX_DEVS=64
CONFIG_VIDEO_VIM2M=m CONFIG_VIDEO_VIM2M=m
CONFIG_DVB_PLATFORM_DRIVERS=y CONFIG_DVB_PLATFORM_DRIVERS=y
CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEC_PLATFORM_DRIVERS=y
CONFIG_SDR_PLATFORM_DRIVERS=y
# #
# Supported MMC/SDIO adapters # Supported MMC/SDIO adapters
@ -5346,6 +5386,10 @@ CONFIG_VIDEO_UPD64083=m
# #
CONFIG_VIDEO_SAA6752HS=m CONFIG_VIDEO_SAA6752HS=m
#
# SDR tuner chips
#
# #
# Miscellaneous helper chips # Miscellaneous helper chips
# #
@ -5618,6 +5662,7 @@ CONFIG_DRM_I915_USERPTR=y
# CONFIG_DRM_I915_WERROR is not set # CONFIG_DRM_I915_WERROR is not set
# CONFIG_DRM_I915_DEBUG is not set # CONFIG_DRM_I915_DEBUG is not set
# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set # CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
# CONFIG_DRM_I915_SELFTEST is not set # CONFIG_DRM_I915_SELFTEST is not set
# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
@ -5640,6 +5685,7 @@ CONFIG_DRM_PANEL=y
# Display Panels # Display Panels
# #
CONFIG_DRM_BRIDGE=y CONFIG_DRM_BRIDGE=y
CONFIG_DRM_PANEL_BRIDGE=y
# #
# Display Interface Bridges # Display Interface Bridges
@ -5839,20 +5885,17 @@ CONFIG_SND_PCM_ELD=y
CONFIG_SND_PCM_IEC958=y CONFIG_SND_PCM_IEC958=y
CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_DMAENGINE_PCM=m
CONFIG_SND_HWDEP=m CONFIG_SND_HWDEP=m
CONFIG_SND_SEQ_DEVICE=m
CONFIG_SND_RAWMIDI=m CONFIG_SND_RAWMIDI=m
CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_COMPRESS_OFFLOAD=m
CONFIG_SND_JACK=y CONFIG_SND_JACK=y
CONFIG_SND_JACK_INPUT_DEV=y CONFIG_SND_JACK_INPUT_DEV=y
CONFIG_SND_SEQUENCER=m
CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_OSSEMUL=y CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=m CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_PCM_TIMER=y CONFIG_SND_PCM_TIMER=y
# CONFIG_SND_SEQUENCER_OSS is not set
CONFIG_SND_HRTIMER=m CONFIG_SND_HRTIMER=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_MAX_CARDS=32 CONFIG_SND_MAX_CARDS=32
CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_SUPPORT_OLD_API=y
@ -5862,13 +5905,18 @@ CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_DEBUG is not set # CONFIG_SND_DEBUG is not set
CONFIG_SND_VMASTER=y CONFIG_SND_VMASTER=y
CONFIG_SND_DMA_SGBUF=y CONFIG_SND_DMA_SGBUF=y
CONFIG_SND_RAWMIDI_SEQ=m CONFIG_SND_SEQUENCER=m
CONFIG_SND_OPL3_LIB_SEQ=m CONFIG_SND_SEQ_DUMMY=m
# CONFIG_SND_OPL4_LIB_SEQ is not set # CONFIG_SND_SEQUENCER_OSS is not set
# CONFIG_SND_SBAWE_SEQ is not set CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
# CONFIG_SND_EMU10K1_SEQ is not set CONFIG_SND_SEQ_MIDI_EVENT=m
CONFIG_SND_SEQ_MIDI=m
CONFIG_SND_SEQ_MIDI_EMUL=m
CONFIG_SND_SEQ_VIRMIDI=m
CONFIG_SND_MPU401_UART=m CONFIG_SND_MPU401_UART=m
CONFIG_SND_OPL3_LIB=m CONFIG_SND_OPL3_LIB=m
CONFIG_SND_OPL3_LIB_SEQ=m
# CONFIG_SND_OPL4_LIB_SEQ is not set
CONFIG_SND_VX_LIB=m CONFIG_SND_VX_LIB=m
CONFIG_SND_AC97_CODEC=m CONFIG_SND_AC97_CODEC=m
CONFIG_SND_DRIVERS=y CONFIG_SND_DRIVERS=y
@ -5918,6 +5966,7 @@ CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGODJ=m CONFIG_SND_INDIGODJ=m
CONFIG_SND_INDIGOIOX=m CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGODJX=m CONFIG_SND_INDIGODJX=m
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_ENS1370=m CONFIG_SND_ENS1370=m
CONFIG_SND_ENS1371=m CONFIG_SND_ENS1371=m
CONFIG_SND_FM801=m CONFIG_SND_FM801=m
@ -6046,11 +6095,18 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SKYLAKE=m
CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
#
# STMicroelectronics STM32 SOC audio support
#
CONFIG_SND_SOC_XTFPGA_I2S=m CONFIG_SND_SOC_XTFPGA_I2S=m
CONFIG_ZX_TDM=m CONFIG_ZX_TDM=m
CONFIG_SND_SOC_I2C_AND_SPI=m CONFIG_SND_SOC_I2C_AND_SPI=m
@ -6098,6 +6154,7 @@ CONFIG_SND_SOC_DIO2125=m
CONFIG_SND_SOC_DMIC=m CONFIG_SND_SOC_DMIC=m
CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_HDMI_CODEC=m
CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES7134=m
CONFIG_SND_SOC_ES8316=m
CONFIG_SND_SOC_ES8328=m CONFIG_SND_SOC_ES8328=m
CONFIG_SND_SOC_ES8328_I2C=m CONFIG_SND_SOC_ES8328_I2C=m
CONFIG_SND_SOC_ES8328_SPI=m CONFIG_SND_SOC_ES8328_SPI=m
@ -6125,11 +6182,13 @@ CONFIG_SND_SOC_RL6231=m
CONFIG_SND_SOC_RL6347A=m CONFIG_SND_SOC_RL6347A=m
CONFIG_SND_SOC_RT286=m CONFIG_SND_SOC_RT286=m
CONFIG_SND_SOC_RT298=m CONFIG_SND_SOC_RT298=m
CONFIG_SND_SOC_RT5514=m
CONFIG_SND_SOC_RT5616=m CONFIG_SND_SOC_RT5616=m
CONFIG_SND_SOC_RT5631=m CONFIG_SND_SOC_RT5631=m
CONFIG_SND_SOC_RT5640=m CONFIG_SND_SOC_RT5640=m
CONFIG_SND_SOC_RT5645=m CONFIG_SND_SOC_RT5645=m
CONFIG_SND_SOC_RT5651=m CONFIG_SND_SOC_RT5651=m
CONFIG_SND_SOC_RT5663=m
CONFIG_SND_SOC_RT5670=m CONFIG_SND_SOC_RT5670=m
CONFIG_SND_SOC_RT5677=m CONFIG_SND_SOC_RT5677=m
CONFIG_SND_SOC_RT5677_SPI=m CONFIG_SND_SOC_RT5677_SPI=m
@ -6179,6 +6238,7 @@ CONFIG_SND_SOC_WM8962=m
CONFIG_SND_SOC_WM8974=m CONFIG_SND_SOC_WM8974=m
CONFIG_SND_SOC_WM8978=m CONFIG_SND_SOC_WM8978=m
CONFIG_SND_SOC_WM8985=m CONFIG_SND_SOC_WM8985=m
CONFIG_SND_SOC_ZX_AUD96P22=m
CONFIG_SND_SOC_NAU8540=m CONFIG_SND_SOC_NAU8540=m
CONFIG_SND_SOC_NAU8810=m CONFIG_SND_SOC_NAU8810=m
CONFIG_SND_SOC_NAU8824=m CONFIG_SND_SOC_NAU8824=m
@ -6236,6 +6296,7 @@ CONFIG_HID_UCLOGIC=m
CONFIG_HID_WALTOP=m CONFIG_HID_WALTOP=m
CONFIG_HID_GYRATION=m CONFIG_HID_GYRATION=m
CONFIG_HID_ICADE=m CONFIG_HID_ICADE=m
CONFIG_HID_ITE=m
CONFIG_HID_TWINHAN=m CONFIG_HID_TWINHAN=m
CONFIG_HID_KENSINGTON=m CONFIG_HID_KENSINGTON=m
CONFIG_HID_LCPOWER=m CONFIG_HID_LCPOWER=m
@ -6268,6 +6329,7 @@ CONFIG_HID_PICOLCD_LEDS=y
CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PICOLCD_CIR=y
CONFIG_HID_PLANTRONICS=m CONFIG_HID_PLANTRONICS=m
CONFIG_HID_PRIMAX=m CONFIG_HID_PRIMAX=m
CONFIG_HID_RETRODE=m
CONFIG_HID_ROCCAT=m CONFIG_HID_ROCCAT=m
CONFIG_HID_SAITEK=m CONFIG_HID_SAITEK=m
CONFIG_HID_SAMSUNG=m CONFIG_HID_SAMSUNG=m
@ -6566,7 +6628,6 @@ CONFIG_USB_HSIC_USB3503=m
CONFIG_USB_HSIC_USB4604=m CONFIG_USB_HSIC_USB4604=m
CONFIG_USB_LINK_LAYER_TEST=m CONFIG_USB_LINK_LAYER_TEST=m
CONFIG_USB_CHAOSKEY=m CONFIG_USB_CHAOSKEY=m
CONFIG_UCSI=m
CONFIG_USB_ATM=m CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m CONFIG_USB_CXACRU=m
@ -6619,6 +6680,7 @@ CONFIG_USB_F_ACM=m
CONFIG_USB_F_SS_LB=m CONFIG_USB_F_SS_LB=m
CONFIG_USB_U_SERIAL=m CONFIG_USB_U_SERIAL=m
CONFIG_USB_U_ETHER=m CONFIG_USB_U_ETHER=m
CONFIG_USB_U_AUDIO=m
CONFIG_USB_F_SERIAL=m CONFIG_USB_F_SERIAL=m
CONFIG_USB_F_OBEX=m CONFIG_USB_F_OBEX=m
CONFIG_USB_F_NCM=m CONFIG_USB_F_NCM=m
@ -6650,6 +6712,7 @@ CONFIG_USB_CONFIGFS_MASS_STORAGE=y
CONFIG_USB_CONFIGFS_F_LB_SS=y CONFIG_USB_CONFIGFS_F_LB_SS=y
CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_FS=y
CONFIG_USB_CONFIGFS_F_UAC1=y CONFIG_USB_CONFIGFS_F_UAC1=y
# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
CONFIG_USB_CONFIGFS_F_UAC2=y CONFIG_USB_CONFIGFS_F_UAC2=y
CONFIG_USB_CONFIGFS_F_MIDI=y CONFIG_USB_CONFIGFS_F_MIDI=y
CONFIG_USB_CONFIGFS_F_HID=y CONFIG_USB_CONFIGFS_F_HID=y
@ -6659,6 +6722,7 @@ CONFIG_USB_CONFIGFS_F_PRINTER=y
CONFIG_USB_ZERO=m CONFIG_USB_ZERO=m
CONFIG_USB_AUDIO=m CONFIG_USB_AUDIO=m
CONFIG_GADGET_UAC1=y CONFIG_GADGET_UAC1=y
# CONFIG_GADGET_UAC1_LEGACY is not set
CONFIG_USB_ETH=m CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y CONFIG_USB_ETH_RNDIS=y
CONFIG_USB_ETH_EEM=y CONFIG_USB_ETH_EEM=y
@ -6687,6 +6751,8 @@ CONFIG_USB_G_WEBCAM=m
# USB Power Delivery and Type-C drivers # USB Power Delivery and Type-C drivers
# #
CONFIG_TYPEC=m CONFIG_TYPEC=m
CONFIG_TYPEC_UCSI=m
CONFIG_UCSI_ACPI=m
CONFIG_USB_LED_TRIG=y CONFIG_USB_LED_TRIG=y
CONFIG_USB_ULPI_BUS=m CONFIG_USB_ULPI_BUS=m
CONFIG_UWB=m CONFIG_UWB=m
@ -6697,7 +6763,6 @@ CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set # CONFIG_MMC_DEBUG is not set
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_BLOCK_BOUNCE=y
CONFIG_SDIO_UART=m CONFIG_SDIO_UART=m
# CONFIG_MMC_TEST is not set # CONFIG_MMC_TEST is not set
@ -6885,6 +6950,7 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
CONFIG_RTC_SYSTOHC=y CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_SYSTOHC_DEVICE="rtc0" CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set # CONFIG_RTC_DEBUG is not set
CONFIG_RTC_NVMEM=y
# #
# RTC interfaces # RTC interfaces
@ -6963,6 +7029,7 @@ CONFIG_RTC_I2C_AND_SPI=y
# SPI and I2C RTC drivers # SPI and I2C RTC drivers
# #
CONFIG_RTC_DRV_DS3232=m CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_DS3232_HWMON=y
CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF2127=m
CONFIG_RTC_DRV_RV3029C2=m CONFIG_RTC_DRV_RV3029C2=m
CONFIG_RTC_DRV_RV3029_HWMON=y CONFIG_RTC_DRV_RV3029_HWMON=y
@ -7003,6 +7070,7 @@ CONFIG_RTC_DRV_AB3100=m
# #
# on-CPU RTC drivers # on-CPU RTC drivers
# #
CONFIG_RTC_DRV_FTRTC010=m
CONFIG_RTC_DRV_PCAP=m CONFIG_RTC_DRV_PCAP=m
CONFIG_RTC_DRV_MC13XXX=m CONFIG_RTC_DRV_MC13XXX=m
CONFIG_RTC_DRV_MT6397=m CONFIG_RTC_DRV_MT6397=m
@ -7339,7 +7407,6 @@ CONFIG_AD5933=m
# #
# Light sensors # Light sensors
# #
CONFIG_SENSORS_ISL29028=m
CONFIG_TSL2x7x=m CONFIG_TSL2x7x=m
# #
@ -7467,6 +7534,7 @@ CONFIG_KS7010=m
CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TCPM=m
CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPCI=m
CONFIG_TYPEC_FUSB302=m CONFIG_TYPEC_FUSB302=m
CONFIG_DRM_VBOXVIDEO=m
CONFIG_X86_PLATFORM_DEVICES=y CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m CONFIG_ACERHDF=m
@ -7480,7 +7548,6 @@ CONFIG_DELL_WMI_LED=m
CONFIG_DELL_SMO8800=m CONFIG_DELL_SMO8800=m
CONFIG_DELL_RBTN=m CONFIG_DELL_RBTN=m
CONFIG_FUJITSU_LAPTOP=m CONFIG_FUJITSU_LAPTOP=m
# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
CONFIG_FUJITSU_TABLET=m CONFIG_FUJITSU_TABLET=m
CONFIG_AMILO_RFKILL=m CONFIG_AMILO_RFKILL=m
CONFIG_HP_ACCEL=m CONFIG_HP_ACCEL=m
@ -7508,7 +7575,9 @@ CONFIG_ASUS_NB_WMI=m
CONFIG_EEEPC_WMI=m CONFIG_EEEPC_WMI=m
CONFIG_ASUS_WIRELESS=m CONFIG_ASUS_WIRELESS=m
CONFIG_ACPI_WMI=m CONFIG_ACPI_WMI=m
CONFIG_WMI_BMOF=m
CONFIG_MSI_WMI=m CONFIG_MSI_WMI=m
CONFIG_PEAQ_WMI=m
CONFIG_TOPSTAR_LAPTOP=m CONFIG_TOPSTAR_LAPTOP=m
CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_TOSHIBA=m
CONFIG_TOSHIBA_BT_RFKILL=m CONFIG_TOSHIBA_BT_RFKILL=m
@ -7516,6 +7585,7 @@ CONFIG_TOSHIBA_HAPS=m
CONFIG_TOSHIBA_WMI=m CONFIG_TOSHIBA_WMI=m
CONFIG_ACPI_CMPC=m CONFIG_ACPI_CMPC=m
CONFIG_INTEL_CHT_INT33FE=m CONFIG_INTEL_CHT_INT33FE=m
CONFIG_INTEL_INT0002_VGPIO=m
CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_HID_EVENT=m
CONFIG_INTEL_VBTN=m CONFIG_INTEL_VBTN=m
CONFIG_INTEL_IPS=m CONFIG_INTEL_IPS=m
@ -7545,6 +7615,7 @@ CONFIG_CHROMEOS_LAPTOP=m
CONFIG_CHROMEOS_PSTORE=m CONFIG_CHROMEOS_PSTORE=m
CONFIG_CROS_EC_CHARDEV=m CONFIG_CROS_EC_CHARDEV=m
CONFIG_CROS_EC_LPC=m CONFIG_CROS_EC_LPC=m
# CONFIG_CROS_EC_LPC_MEC is not set
CONFIG_CROS_EC_PROTO=y CONFIG_CROS_EC_PROTO=y
CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROS_KBD_LED_BACKLIGHT=m
CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKDEV_LOOKUP=y
@ -7565,10 +7636,7 @@ CONFIG_COMMON_CLK_PALMAS=m
CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_PWM=m
# CONFIG_COMMON_CLK_PXA is not set # CONFIG_COMMON_CLK_PXA is not set
# CONFIG_COMMON_CLK_PIC32 is not set # CONFIG_COMMON_CLK_PIC32 is not set
CONFIG_HWSPINLOCK=m
#
# Hardware Spinlock drivers
#
# #
# Clock Source drivers # Clock Source drivers
@ -7608,6 +7676,9 @@ CONFIG_REMOTEPROC=m
# #
# Rpmsg drivers # Rpmsg drivers
# #
CONFIG_RPMSG=m
# CONFIG_RPMSG_CHAR is not set
CONFIG_RPMSG_QCOM_GLINK_RPM=m
# #
# SOC (System On Chip) specific Drivers # SOC (System On Chip) specific Drivers
@ -7622,7 +7693,6 @@ CONFIG_REMOTEPROC=m
# #
# CONFIG_SUNXI_SRAM is not set # CONFIG_SUNXI_SRAM is not set
CONFIG_SOC_TI=y CONFIG_SOC_TI=y
# CONFIG_SOC_ZTE is not set
CONFIG_PM_DEVFREQ=y CONFIG_PM_DEVFREQ=y
# #
@ -7648,13 +7718,13 @@ CONFIG_EXTCON_ARIZONA=m
CONFIG_EXTCON_AXP288=m CONFIG_EXTCON_AXP288=m
CONFIG_EXTCON_GPIO=m CONFIG_EXTCON_GPIO=m
CONFIG_EXTCON_INTEL_INT3496=m CONFIG_EXTCON_INTEL_INT3496=m
CONFIG_EXTCON_INTEL_CHT_WC=m
CONFIG_EXTCON_MAX14577=m CONFIG_EXTCON_MAX14577=m
CONFIG_EXTCON_MAX3355=m CONFIG_EXTCON_MAX3355=m
CONFIG_EXTCON_MAX77693=m CONFIG_EXTCON_MAX77693=m
CONFIG_EXTCON_MAX77843=m CONFIG_EXTCON_MAX77843=m
CONFIG_EXTCON_MAX8997=m CONFIG_EXTCON_MAX8997=m
CONFIG_EXTCON_PALMAS=m CONFIG_EXTCON_PALMAS=m
CONFIG_EXTCON_QCOM_SPMI_MISC=m
CONFIG_EXTCON_RT8973A=m CONFIG_EXTCON_RT8973A=m
CONFIG_EXTCON_SM5502=m CONFIG_EXTCON_SM5502=m
CONFIG_EXTCON_USB_GPIO=m CONFIG_EXTCON_USB_GPIO=m
@ -7745,7 +7815,9 @@ CONFIG_QCOM_SPMI_IADC=m
CONFIG_QCOM_SPMI_VADC=m CONFIG_QCOM_SPMI_VADC=m
CONFIG_TI_ADC081C=m CONFIG_TI_ADC081C=m
CONFIG_TI_ADC0832=m CONFIG_TI_ADC0832=m
CONFIG_TI_ADC084S021=m
CONFIG_TI_ADC12138=m CONFIG_TI_ADC12138=m
CONFIG_TI_ADC108S102=m
CONFIG_TI_ADC128S052=m CONFIG_TI_ADC128S052=m
CONFIG_TI_ADC161S626=m CONFIG_TI_ADC161S626=m
CONFIG_TI_ADS1015=m CONFIG_TI_ADS1015=m
@ -7918,6 +7990,7 @@ CONFIG_CM36651=m
CONFIG_IIO_CROS_EC_LIGHT_PROX=m CONFIG_IIO_CROS_EC_LIGHT_PROX=m
CONFIG_GP2AP020A00F=m CONFIG_GP2AP020A00F=m
CONFIG_SENSORS_ISL29018=m CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_ISL29028=m
CONFIG_ISL29125=m CONFIG_ISL29125=m
CONFIG_HID_SENSOR_ALS=m CONFIG_HID_SENSOR_ALS=m
CONFIG_HID_SENSOR_PROX=m CONFIG_HID_SENSOR_PROX=m
@ -7958,6 +8031,10 @@ CONFIG_SENSORS_HMC5843=m
CONFIG_SENSORS_HMC5843_I2C=m CONFIG_SENSORS_HMC5843_I2C=m
CONFIG_SENSORS_HMC5843_SPI=m CONFIG_SENSORS_HMC5843_SPI=m
#
# Multiplexers
#
# #
# Inclinometer sensors # Inclinometer sensors
# #
@ -8039,6 +8116,7 @@ CONFIG_TSYS01=m
CONFIG_TSYS02D=m CONFIG_TSYS02D=m
CONFIG_NTB=m CONFIG_NTB=m
CONFIG_NTB_AMD=m CONFIG_NTB_AMD=m
CONFIG_NTB_IDT=m
CONFIG_NTB_INTEL=m CONFIG_NTB_INTEL=m
CONFIG_NTB_PINGPONG=m CONFIG_NTB_PINGPONG=m
CONFIG_NTB_TOOL=m CONFIG_NTB_TOOL=m
@ -8081,6 +8159,7 @@ CONFIG_SERIAL_IPOCTAL=m
CONFIG_RESET_CONTROLLER=y CONFIG_RESET_CONTROLLER=y
# CONFIG_RESET_ATH79 is not set # CONFIG_RESET_ATH79 is not set
# CONFIG_RESET_BERLIN is not set # CONFIG_RESET_BERLIN is not set
# CONFIG_RESET_GEMINI is not set
# CONFIG_RESET_IMX7 is not set # CONFIG_RESET_IMX7 is not set
# CONFIG_RESET_LPC18XX is not set # CONFIG_RESET_LPC18XX is not set
# CONFIG_RESET_MESON is not set # CONFIG_RESET_MESON is not set
@ -8088,7 +8167,7 @@ CONFIG_RESET_CONTROLLER=y
# CONFIG_RESET_SOCFPGA is not set # CONFIG_RESET_SOCFPGA is not set
# CONFIG_RESET_STM32 is not set # CONFIG_RESET_STM32 is not set
# CONFIG_RESET_SUNXI is not set # CONFIG_RESET_SUNXI is not set
CONFIG_TI_SYSCON_RESET=m CONFIG_RESET_TI_SYSCON=m
# CONFIG_RESET_ZYNQ is not set # CONFIG_RESET_ZYNQ is not set
# CONFIG_RESET_TEGRA_BPMP is not set # CONFIG_RESET_TEGRA_BPMP is not set
CONFIG_FMC=m CONFIG_FMC=m
@ -8101,15 +8180,16 @@ CONFIG_FMC_CHARDEV=m
# PHY Subsystem # PHY Subsystem
# #
CONFIG_GENERIC_PHY=y CONFIG_GENERIC_PHY=y
CONFIG_BCM_KONA_USB2_PHY=m
CONFIG_PHY_PXA_28NM_HSIC=m CONFIG_PHY_PXA_28NM_HSIC=m
CONFIG_PHY_PXA_28NM_USB2=m CONFIG_PHY_PXA_28NM_USB2=m
CONFIG_BCM_KONA_USB2_PHY=m CONFIG_PHY_CPCAP_USB=m
CONFIG_PHY_QCOM_USB_HS=m
CONFIG_PHY_QCOM_USB_HSIC=m
CONFIG_PHY_SAMSUNG_USB2=m CONFIG_PHY_SAMSUNG_USB2=m
# CONFIG_PHY_EXYNOS4210_USB2 is not set # CONFIG_PHY_EXYNOS4210_USB2 is not set
# CONFIG_PHY_EXYNOS4X12_USB2 is not set # CONFIG_PHY_EXYNOS4X12_USB2 is not set
# CONFIG_PHY_EXYNOS5250_USB2 is not set # CONFIG_PHY_EXYNOS5250_USB2 is not set
CONFIG_PHY_QCOM_USB_HS=m
CONFIG_PHY_QCOM_USB_HSIC=m
CONFIG_PHY_TUSB1210=m CONFIG_PHY_TUSB1210=m
CONFIG_POWERCAP=y CONFIG_POWERCAP=y
CONFIG_INTEL_RAPL=m CONFIG_INTEL_RAPL=m
@ -8121,7 +8201,6 @@ CONFIG_MCB_LPC=m
# Performance monitor support # Performance monitor support
# #
CONFIG_RAS=y CONFIG_RAS=y
# CONFIG_MCE_AMD_INJ is not set
# CONFIG_RAS_CEC is not set # CONFIG_RAS_CEC is not set
CONFIG_THUNDERBOLT=m CONFIG_THUNDERBOLT=m
@ -8141,7 +8220,7 @@ CONFIG_NVDIMM_DAX=y
CONFIG_DAX=y CONFIG_DAX=y
CONFIG_DEV_DAX=m CONFIG_DEV_DAX=m
CONFIG_DEV_DAX_PMEM=m CONFIG_DEV_DAX_PMEM=m
CONFIG_NVMEM=m CONFIG_NVMEM=y
CONFIG_STM=m CONFIG_STM=m
CONFIG_STM_DUMMY=m CONFIG_STM_DUMMY=m
CONFIG_STM_SOURCE_CONSOLE=m CONFIG_STM_SOURCE_CONSOLE=m
@ -8289,6 +8368,7 @@ CONFIG_FUSE_FS=y
CONFIG_CUSE=m CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
# CONFIG_OVERLAY_FS_INDEX is not set
# #
# Caches # Caches
@ -8477,8 +8557,8 @@ CONFIG_CIFS_POSIX=y
CONFIG_CIFS_ACL=y CONFIG_CIFS_ACL=y
CONFIG_CIFS_DEBUG=y CONFIG_CIFS_DEBUG=y
# CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DEBUG2 is not set
# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_DFS_UPCALL=y
CONFIG_CIFS_SMB2=y
CONFIG_CIFS_SMB311=y CONFIG_CIFS_SMB311=y
CONFIG_CIFS_FSCACHE=y CONFIG_CIFS_FSCACHE=y
CONFIG_NCP_FS=m CONFIG_NCP_FS=m
@ -8623,6 +8703,9 @@ CONFIG_ARCH_HAS_KCOV=y
# Debug Lockups and Hangs # Debug Lockups and Hangs
# #
CONFIG_LOCKUP_DETECTOR=y CONFIG_LOCKUP_DETECTOR=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_HARDLOCKUP_DETECTOR_PERF=y
CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
CONFIG_HARDLOCKUP_DETECTOR=y CONFIG_HARDLOCKUP_DETECTOR=y
# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
@ -8657,6 +8740,7 @@ CONFIG_SCHED_STACK_END_CHECK=y
CONFIG_LOCK_TORTURE_TEST=m CONFIG_LOCK_TORTURE_TEST=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_STACKTRACE=y CONFIG_STACKTRACE=y
# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
# CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_LIST is not set
@ -8669,7 +8753,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
# RCU Debugging # RCU Debugging
# #
# CONFIG_PROVE_RCU is not set # CONFIG_PROVE_RCU is not set
# CONFIG_SPARSE_RCU_POINTER is not set
CONFIG_TORTURE_TEST=m CONFIG_TORTURE_TEST=m
# CONFIG_RCU_PERF_TEST is not set # CONFIG_RCU_PERF_TEST is not set
# CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set
@ -8732,7 +8815,7 @@ CONFIG_MMIOTRACE=y
# CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_TRACEPOINT_BENCHMARK is not set
# CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_RING_BUFFER_BENCHMARK is not set
# CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set
# CONFIG_TRACE_ENUM_MAP_FILE is not set # CONFIG_TRACE_EVAL_MAP_FILE is not set
CONFIG_TRACING_EVENTS_GPIO=y CONFIG_TRACING_EVENTS_GPIO=y
# #
@ -8763,10 +8846,12 @@ CONFIG_TEST_LKM=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
# CONFIG_TEST_SYSCTL is not set
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
CONFIG_MEMTEST=y CONFIG_MEMTEST=y
CONFIG_TEST_STATIC_KEYS=m CONFIG_TEST_STATIC_KEYS=m
# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_BUG_ON_DATA_CORRUPTION is not set
# CONFIG_TEST_KMOD is not set
# CONFIG_SAMPLES is not set # CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_KGDB=y
CONFIG_KGDB=y CONFIG_KGDB=y
@ -8831,6 +8916,7 @@ CONFIG_SECURITY=y
CONFIG_SECURITY_WRITABLE_HOOKS=y CONFIG_SECURITY_WRITABLE_HOOKS=y
CONFIG_SECURITYFS=y CONFIG_SECURITYFS=y
CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_INFINIBAND is not set
CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y CONFIG_SECURITY_PATH=y
CONFIG_INTEL_TXT=y CONFIG_INTEL_TXT=y
@ -8838,6 +8924,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=0
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
CONFIG_FORTIFY_SOURCE=y
# CONFIG_STATIC_USERMODEHELPER is not set # CONFIG_STATIC_USERMODEHELPER is not set
CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y
@ -8878,11 +8965,11 @@ CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
CONFIG_IMA_DEFAULT_HASH_SHA1=y CONFIG_IMA_DEFAULT_HASH_SHA1=y
# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set # CONFIG_IMA_DEFAULT_HASH_SHA256 is not set
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DEFAULT_HASH_WP512 is not set
CONFIG_IMA_DEFAULT_HASH="sha1" CONFIG_IMA_DEFAULT_HASH="sha1"
# CONFIG_IMA_WRITE_POLICY is not set # CONFIG_IMA_WRITE_POLICY is not set
# CONFIG_IMA_READ_POLICY is not set # CONFIG_IMA_READ_POLICY is not set
CONFIG_IMA_APPRAISE=y CONFIG_IMA_APPRAISE=y
CONFIG_IMA_APPRAISE_BOOTPARAM=y
CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_TRUSTED_KEYRING=y
CONFIG_IMA_BLACKLIST_KEYRING=y CONFIG_IMA_BLACKLIST_KEYRING=y
# CONFIG_IMA_LOAD_X509 is not set # CONFIG_IMA_LOAD_X509 is not set
@ -9087,6 +9174,8 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m
CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
CONFIG_CRYPTO_DEV_QAT_C62XVF=m CONFIG_CRYPTO_DEV_QAT_C62XVF=m
CONFIG_CRYPTO_DEV_NITROX=m
CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_CHELSIO=m
CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DEV_VIRTIO=m
CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_KEY_TYPE=y
@ -9153,6 +9242,7 @@ CONFIG_CRC32_SLICEBY8=y
# CONFIG_CRC32_SLICEBY4 is not set # CONFIG_CRC32_SLICEBY4 is not set
# CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_SARWATE is not set
# CONFIG_CRC32_BIT is not set # CONFIG_CRC32_BIT is not set
# CONFIG_CRC4 is not set
CONFIG_CRC7=m CONFIG_CRC7=m
CONFIG_LIBCRC32C=m CONFIG_LIBCRC32C=m
CONFIG_CRC8=m CONFIG_CRC8=m
@ -9225,6 +9315,7 @@ CONFIG_FONT_8x16=y
CONFIG_SG_POOL=y CONFIG_SG_POOL=y
CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAS_SG_CHAIN=y
CONFIG_ARCH_HAS_PMEM_API=y CONFIG_ARCH_HAS_PMEM_API=y
CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
CONFIG_ARCH_HAS_MMIO_FLUSH=y CONFIG_ARCH_HAS_MMIO_FLUSH=y
CONFIG_SBITMAP=y CONFIG_SBITMAP=y
CONFIG_PARMAN=m CONFIG_PARMAN=m

2
gnu/packages/avr.scm
View File

@ -157,7 +157,7 @@ C++.")
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) (list (string-append "PREFIX=" (assoc-ref %outputs "out")))))
(native-inputs (native-inputs
`(("unzip" ,unzip) `(("unzip" ,unzip)
("vim" ,vim))) ; for xxd ("xxd" ,xxd)))
(home-page "http://microscheme.org/") (home-page "http://microscheme.org/")
(synopsis "Scheme subset for Atmel microcontrollers") (synopsis "Scheme subset for Atmel microcontrollers")
(description (description

11
gnu/packages/backup.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -184,6 +184,7 @@ backups (called chunks) to allow easy burning to CD/DVD.")
(define-public libarchive (define-public libarchive
(package (package
(name "libarchive") (name "libarchive")
(replacement libarchive-3.3.2)
(version "3.3.1") (version "3.3.1")
(source (source
(origin (origin
@ -239,19 +240,19 @@ archive. In particular, note that there is currently no built-in support for
random access nor for in-place modification.") random access nor for in-place modification.")
(license license:bsd-2))) (license license:bsd-2)))
(define libarchive-3.3.1 (define libarchive-3.3.2
(package (package
(inherit libarchive) (inherit libarchive)
(name "libarchive") (version "3.3.2")
(version "3.3.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://libarchive.org/downloads/libarchive-" (uri (string-append "http://libarchive.org/downloads/libarchive-"
version ".tar.gz")) version ".tar.gz"))
(patches (search-patches "libarchive-CVE-2017-14166.patch"))
(sha256 (sha256
(base32 (base32
"1rr40hxlm9vy5z2zb5w7pyfkgd1a4s061qapm83s19accb8mpji9")))))) "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd"))))))
(define-public rdup (define-public rdup
(package (package

14
gnu/packages/base.scm
View File

@ -392,6 +392,7 @@ change. GNU make offers many powerful extensions over the standard utility.")
(define-public binutils (define-public binutils
(package (package
(replacement binutils/fixed)
(name "binutils") (name "binutils")
(version "2.28") (version "2.28")
(source (origin (source (origin
@ -433,6 +434,19 @@ included.")
(license gpl3+) (license gpl3+)
(home-page "https://www.gnu.org/software/binutils/"))) (home-page "https://www.gnu.org/software/binutils/")))
(define binutils/fixed
(package
(inherit binutils)
;; 2.28.1 is two characters longer than 2.28, so grafting fails due to
;; mismatched lengths of filenames, so we have to force it to the same length.
(version "2281")
(source
(origin (inherit (package-source binutils))
(uri "mirror://gnu/binutils/binutils-2.28.1.tar.bz2")
(sha256
(base32
"1sj234nd05cdgga1r36zalvvdkvpfbr12g5mir2n8i1dwsdrj939"))))))
(define* (make-ld-wrapper name #:key (define* (make-ld-wrapper name #:key
(target (const #f)) (target (const #f))
binutils binutils

12
gnu/packages/bdw-gc.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
@ -78,6 +78,16 @@ C or C++ programs, though that is not its primary goal.")
(license (x11-style (string-append home-page "license.txt"))))) (license (x11-style (string-append home-page "license.txt")))))
(define-public libgc/back-pointers
(package
(inherit libgc)
(name "libgc-back-pointers")
(arguments
`(#:make-flags
(list "CPPFLAGS=-DKEEP_BACK_PTRS=1")
,@(package-arguments libgc)))
(synopsis "The BDW garbage collector, with back-pointer tracking")))
(define-public libatomic-ops (define-public libatomic-ops
(package (package
(name "libatomic-ops") (name "libatomic-ops")

106
gnu/packages/bioinformatics.scm
View File

@ -3450,7 +3450,7 @@ sequences).")
(("^#include \"kseq\\.h\"") (("^#include \"kseq\\.h\"")
"#include \"htslib/kseq.h\"")) "#include \"htslib/kseq.h\""))
#t)) #t))
(add-before 'configure 'autoconf (add-after 'fix-includes 'autoconf
(lambda _ (zero? (system* "autoconf"))))))) (lambda _ (zero? (system* "autoconf")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
@ -3475,7 +3475,7 @@ form of assemblies or reads.")
(define-public metabat (define-public metabat
(package (package
(name "metabat") (name "metabat")
(version "2.11.2") (version "2.12.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -3484,10 +3484,8 @@ form of assemblies or reads.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0rws9r1ziv6way8cf49jg8bzj7x2131kfqkhj8byf0z5hnrq3bwv")) "1hmvdalz3zj5sqqklg0l4npjdv37cv2hsdi1al9iby2ndxjs1b73"))
(patches (search-patches "metabat-remove-compilation-date.patch" (patches (search-patches "metabat-fix-compilation.patch"))))
"metabat-fix-compilation.patch"
"metabat-fix-boost-issue.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -4065,7 +4063,7 @@ predicts the locations of structural units in the sequences.")
(define-public proteinortho (define-public proteinortho
(package (package
(name "proteinortho") (name "proteinortho")
(version "5.16") (version "5.16b")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4075,7 +4073,7 @@ predicts the locations of structural units in the sequences.")
version "_src.tar.gz")) version "_src.tar.gz"))
(sha256 (sha256
(base32 (base32
"0z4f5cg0cs8ai62hfvp4q6w66q2phcc55nhs4xj5cyhxxivjv2ai")))) "1wl0dawpssqwfjvr651r4wlww8hhjin8nba6xh71ks7sbypx886j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -4751,6 +4749,13 @@ simultaneously.")
#:tests? #f ; no "check" target #:tests? #f ; no "check" target
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'set-perl-search-path
(lambda _
;; Work around "dotless @INC" build failure.
(setenv "PERL5LIB"
(string-append (getcwd) "/setup:"
(getenv "PERL5LIB")))
#t))
(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")))
@ -5056,6 +5061,13 @@ sequence itself can be retrieved from these databases.")
"/lib32"))) "/lib32")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'set-perl-search-path
(lambda _
;; Work around "dotless @INC" build failure.
(setenv "PERL5LIB"
(string-append (getcwd) "/setup:"
(getenv "PERL5LIB")))
#t))
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; The build system expects a directory containing the sources and ;; The build system expects a directory containing the sources and
@ -5396,7 +5408,7 @@ application of SortMeRNA is filtering rRNA from metatranscriptomic data.")
#t)) #t))
(delete 'configure)))) (delete 'configure))))
(native-inputs (native-inputs
`(("vim" ,vim))) ; for xxd `(("xxd" ,xxd)))
(inputs (inputs
`(("htslib" ,htslib) `(("htslib" ,htslib)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -5654,18 +5666,17 @@ information as possible.")
(define-public r-vegan (define-public r-vegan
(package (package
(name "r-vegan") (name "r-vegan")
(version "2.4-3") (version "2.4-4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "vegan" version)) (uri (cran-uri "vegan" version))
(sha256 (sha256
(base32 (base32
"15zcxfix2d854897k1lr0sfmj2n00339nlsppcr3zrb238lb2mi5")))) "1n57dzv2aid6iqd9fkqik401sidqanhzsawyak94qbiyh6dbd1x9"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
`(("gfortran" ,gfortran) `(("gfortran" ,gfortran)))
("r-knitr" ,r-knitr)))
(propagated-inputs (propagated-inputs
`(("r-cluster" ,r-cluster) `(("r-cluster" ,r-cluster)
("r-lattice" ,r-lattice) ("r-lattice" ,r-lattice)
@ -6126,10 +6137,33 @@ data. It is derived from the UCSC hg19 genome and based on the \"knownGene\"
track. The database is exposed as a @code{TxDb} object.") track. The database is exposed as a @code{TxDb} object.")
(license license:artistic2.0))) (license license:artistic2.0)))
(define-public r-sparql
(package
(name "r-sparql")
(version "1.16")
(source (origin
(method url-fetch)
(uri (cran-uri "SPARQL" version))
(sha256
(base32
"0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"))))
(properties `((upstream-name . "SPARQL")))
(build-system r-build-system)
(propagated-inputs
`(("r-rcurl" ,r-rcurl)
("r-xml" ,r-xml)))
(home-page "http://cran.r-project.org/web/packages/SPARQL")
(synopsis "SPARQL client for R")
(description "This package provides an interface to use SPARQL to pose
SELECT or UPDATE queries to an end-point.")
;; The only license indication is found in the DESCRIPTION file,
;; which states GPL-3. So we cannot assume GPLv3+.
(license license:gpl3)))
(define-public vsearch (define-public vsearch
(package (package
(name "vsearch") (name "vsearch")
(version "2.4.3") (version "2.4.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -6139,7 +6173,7 @@ track. The database is exposed as a @code{TxDb} object.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0hc110ycqpa54nr6x173qg7190hk08qp7yz7zzqxlsypqnpc5zzp")) "1d8a4gjwaqdv57krlr80x18mg5py1bbdiqs5m0jdn38filc9z40k"))
(patches (search-patches "vsearch-unbundle-cityhash.patch")) (patches (search-patches "vsearch-unbundle-cityhash.patch"))
(snippet (snippet
'(begin '(begin
@ -6153,8 +6187,8 @@ track. The database is exposed as a @code{TxDb} object.")
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'autogen (add-after 'unpack 'autogen
(lambda _ (zero? (system* "autoreconf" "-vif"))))))) (lambda _ (zero? (system* "autoreconf" "-vif")))))))
(inputs (inputs
`(("zlib" ,zlib) `(("zlib" ,zlib)
("bzip2" ,bzip2) ("bzip2" ,bzip2)
@ -6433,13 +6467,13 @@ also known as views, in a controlled vocabulary.")
(define-public r-bookdown (define-public r-bookdown
(package (package
(name "r-bookdown") (name "r-bookdown")
(version "0.4") (version "0.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "bookdown" version)) (uri (cran-uri "bookdown" version))
(sha256 (sha256
(base32 (base32
"1fp1k7hivrb7s2dwgrsqy9s7xg6pk9hczhrc149y1dwh901j6qvv")))) "0zm63kr4f4kja4qpwkzl119zzyciqj7ihajfqgfjpgb4dzaiycxp"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-htmltools" ,r-htmltools) `(("r-htmltools" ,r-htmltools)
@ -7109,13 +7143,13 @@ samples.")
(define-public r-genomicalignments (define-public r-genomicalignments
(package (package
(name "r-genomicalignments") (name "r-genomicalignments")
(version "1.12.1") (version "1.12.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "GenomicAlignments" version)) (uri (bioconductor-uri "GenomicAlignments" version))
(sha256 (sha256
(base32 (base32
"127690sys4i5q3l4vxnjg4xg8q19qlw2258vgs5d1156w9ypp04h")))) "03ysxi9fdd3bcfj05iaysya9knn2aa2irwpypb5srg0xwv92bdb9"))))
(properties (properties
`((upstream-name . "GenomicAlignments"))) `((upstream-name . "GenomicAlignments")))
(build-system r-build-system) (build-system r-build-system)
@ -7990,7 +8024,7 @@ paired-end data.")
(define-public r-rcas (define-public r-rcas
(package (package
(name "r-rcas") (name "r-rcas")
(version "1.1.1") (version "1.3.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/RCAS/archive/v" (uri (string-append "https://github.com/BIMSBbioinfo/RCAS/archive/v"
@ -7998,7 +8032,7 @@ paired-end data.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1hd0r66556bxbdd82ksjklq7nfli36l4k6y88ic7kkg9873wa1nw")))) "1qgc7vi6fpzl440yg7jhiycg5q336kd4pxqzx10yx2zcq3bq3msg"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
`(("r-knitr" ,r-knitr) `(("r-knitr" ,r-knitr)
@ -8019,6 +8053,7 @@ paired-end data.")
("r-bsgenome-dmelanogaster-ucsc-dm3" ,r-bsgenome-dmelanogaster-ucsc-dm3) ("r-bsgenome-dmelanogaster-ucsc-dm3" ,r-bsgenome-dmelanogaster-ucsc-dm3)
("r-topgo" ,r-topgo) ("r-topgo" ,r-topgo)
("r-dt" ,r-dt) ("r-dt" ,r-dt)
("r-pbapply" ,r-pbapply)
("r-plotly" ,r-plotly) ("r-plotly" ,r-plotly)
("r-plotrix" ,r-plotrix) ("r-plotrix" ,r-plotrix)
("r-motifrg" ,r-motifrg) ("r-motifrg" ,r-motifrg)
@ -8032,7 +8067,7 @@ paired-end data.")
intuitive reports and publication-ready graphics. This package provides the R intuitive reports and publication-ready graphics. This package provides the R
library implementing most of the pipeline's features.") library implementing most of the pipeline's features.")
(home-page "https://github.com/BIMSBbioinfo/RCAS") (home-page "https://github.com/BIMSBbioinfo/RCAS")
(license license:expat))) (license license:artistic2.0)))
(define-public rcas-web (define-public rcas-web
(package (package
@ -8370,14 +8405,14 @@ used by @code{ensembldb}, @code{Organism.dplyr}, and other packages.")
AC_DEFINE([PLD_png], [1], [Define to 1 if PNG support is available]) AC_DEFINE([PLD_png], [1], [Define to 1 if PNG support is available])
AM_CONDITIONAL(AMPNG, true)")) AM_CONDITIONAL(AMPNG, true)"))
#t)) #t))
(add-after 'unpack 'disable-update-check (add-after 'fix-checks 'disable-update-check
(lambda _ (lambda _
;; At build time there is no connection to the Internet, so ;; At build time there is no connection to the Internet, so
;; looking for updates will not work. ;; looking for updates will not work.
(substitute* "Makefile.am" (substitute* "Makefile.am"
(("\\$\\(bindir\\)/embossupdate") "")) (("\\$\\(bindir\\)/embossupdate") ""))
#t)) #t))
(add-before 'configure 'autogen (add-after 'disable-update-check 'autogen
(lambda _ (zero? (system* "autoreconf" "-vif"))))))) (lambda _ (zero? (system* "autoreconf" "-vif")))))))
(inputs (inputs
`(("perl" ,perl) `(("perl" ,perl)
@ -8575,25 +8610,24 @@ replacement for strverscmp.")
(define-public multiqc (define-public multiqc
(package (package
(name "multiqc") (name "multiqc")
(version "0.9") (version "1.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "multiqc" version)) (uri (pypi-uri "multiqc" version))
(sha256 (sha256
(base32 (base32
"12gs1jw2jrxrij529rnl5kaqxfcqn15yzcsggxkfhdx634ml0cny")) "032svgym67k2ds7wp0cxzv79gi30yrdl45zbqn74lni3dk04qm33"))))
(patches (search-patches "multiqc-fix-git-subprocess-error.patch"))))
(build-system python-build-system) (build-system python-build-system)
(arguments
;; Tests are to be introduced in the next version, see
;; https://github.com/ewels/MultiQC/issues/376
`(#:tests? #f))
(propagated-inputs (propagated-inputs
`(("python-jinja2" ,python-jinja2) `(("python-jinja2" ,python-jinja2)
("python-simplejson" ,python-simplejson) ("python-simplejson" ,python-simplejson)
("python-pyyaml" ,python-pyyaml) ("python-pyyaml" ,python-pyyaml)
("python-click" ,python-click) ("python-click" ,python-click)
("python-spectra" ,python-spectra)
("python-requests" ,python-requests)
("python-markdown" ,python-markdown)
("python-lzstring" ,python-lzstring)
("python-matplotlib" ,python-matplotlib) ("python-matplotlib" ,python-matplotlib)
("python-numpy" ,python-numpy) ("python-numpy" ,python-numpy)
;; MultQC checks for the presence of nose at runtime. ;; MultQC checks for the presence of nose at runtime.
@ -8830,14 +8864,14 @@ trait.")
(define-public r-maldiquant (define-public r-maldiquant
(package (package
(name "r-maldiquant") (name "r-maldiquant")
(version "1.16.2") (version "1.16.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "MALDIquant" version)) (uri (cran-uri "MALDIquant" version))
(sha256 (sha256
(base32 (base32
"0z5srzsfgsgi4bssr4chls4ry6d18y2g9143znqmraylppwrrqzr")))) "1pmhsfvd45a44xdiml4zx3zd5fhygqyziqvygahkk9yibnyhv4cv"))))
(properties `((upstream-name . "MALDIquant"))) (properties `((upstream-name . "MALDIquant")))
(build-system r-build-system) (build-system r-build-system)
(home-page "http://cran.r-project.org/web/packages/MALDIquant") (home-page "http://cran.r-project.org/web/packages/MALDIquant")
@ -9443,7 +9477,7 @@ problems in genomics, brain imaging, astrophysics, and data mining.")
(substitute-keyword-arguments (package-arguments htslib) (substitute-keyword-arguments (package-arguments htslib)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-before 'configure 'bootstrap (add-after 'unpack 'bootstrap
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vif")))))))) (zero? (system* "autoreconf" "-vif"))))))))
(native-inputs (native-inputs

69
gnu/packages/bootloaders.scm
View File

@ -395,3 +395,72 @@ also initializes the boards (RAM etc).")
(define-public u-boot-odroid-c2 (define-public u-boot-odroid-c2
(make-u-boot-package "odroid-c2" "aarch64-linux-gnu")) (make-u-boot-package "odroid-c2" "aarch64-linux-gnu"))
(define-public os-prober
(package
(name "os-prober")
(version "1.76")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://debian/pool/main/o/os-prober/os-prober_"
version ".tar.xz"))
(sha256
(base32
"1vb45i76bqivlghrq7m3n07qfmmq4wxrkplqx8gywj011rhq19fk"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
(ice-9 regex) ; for string-match
(srfi srfi-26)) ; for cut
#:make-flags (list "CC=gcc")
#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(substitute* (find-files ".")
(("/usr") (assoc-ref outputs "out")))
(substitute* (find-files "." "50mounted-tests$")
(("mkdir") "mkdir -p"))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(define (find-files-non-recursive directory)
(find-files directory
(lambda (file stat)
(string-match (string-append "^" directory "/[^/]*$")
file))
#:directories? #t))
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(lib (string-append out "/lib"))
(share (string-append out "/share")))
(for-each (cut install-file <> bin)
(list "linux-boot-prober" "os-prober"))
(install-file "newns" (string-append lib "/os-prober"))
(install-file "common.sh" (string-append share "/os-prober"))
(install-file "os-probes/mounted/powerpc/20macosx"
(string-append lib "/os-probes/mounted"))
(for-each
(lambda (directory)
(for-each
(lambda (file)
(let ((destination (string-append lib "/" directory
"/" (basename file))))
(mkdir-p (dirname destination))
(copy-recursively file destination)))
(append (find-files-non-recursive (string-append directory "/common"))
(find-files-non-recursive (string-append directory "/x86")))))
(list "os-probes" "os-probes/mounted" "os-probes/init"
"linux-boot-probes" "linux-boot-probes/mounted"))
#t))))))
(home-page "https://joeyh.name/code/os-prober")
(synopsis "Detect other operating systems")
(description "os-prober probes disks on the system for other operating
systems so that they can be added to the bootloader. It also works out how to
boot existing GNU/Linux systems and detects what distribution is installed in
order to add a suitable bootloader menu entry.")
(license license:gpl2+)))

23
gnu/packages/build-tools.scm
View File

@ -70,7 +70,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(define-public meson (define-public meson
(package (package
(name "meson") (name "meson")
(version "0.41.1") (version "0.42.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/mesonbuild/meson/" (uri (string-append "https://github.com/mesonbuild/meson/"
@ -78,9 +78,10 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"12ygjh1dxi8z06nl704rfb6zj0m2zjqp279nymfgzfgy5zq032d4")))) "0vyp9rkymzzzilhnf04ryszslyp9a0y0wf4agyijd4w5lcnqlcbc"))))
(build-system python-build-system) (build-system python-build-system)
(inputs `(("ninja", ninja))) (inputs `(("ninja", ninja)))
(propagated-inputs `(("python" ,python)))
(home-page "https://mesonbuild.com/") (home-page "https://mesonbuild.com/")
(synopsis "Build system designed to be fast and user-friendly") (synopsis "Build system designed to be fast and user-friendly")
(description (description
@ -92,6 +93,24 @@ files}, are written in a custom domain-specific language (DSL) that resembles
Python.") Python.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public meson-for-build
(package
(inherit meson)
(name "meson-for-build")
(version "0.42.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mesonbuild/meson/"
"archive/" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0vyp9rkymzzzilhnf04ryszslyp9a0y0wf4agyijd4w5lcnqlcbc"))
(patches (search-patches "meson-for-build-rpath.patch"))))
;; People should probably install "meson", not "meson-for-build".
(properties `((hidden? . #t)))))
(define-public premake4 (define-public premake4
(package (package
(name "premake") (name "premake")

9
gnu/packages/calendar.scm
View File

@ -1,8 +1,8 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com> ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2016 Stefan Reichoer <stefan@xsteve.at> ;;; Copyright © 2016 Stefan Reichoer <stefan@xsteve.at>
;;; ;;;
@ -55,9 +55,8 @@
(arguments (arguments
'(#:tests? #f ; test suite appears broken '(#:tests? #f ; test suite appears broken
#:configure-flags #:configure-flags
(list (string-append "-DCMAKE_INSTALL_RPATH=" (list (string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out") "/lib:" (assoc-ref %outputs "out") "/lib"))
(assoc-ref %outputs "out") "/lib64"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'patch-paths (add-before 'configure 'patch-paths

4
gnu/packages/cdrom.scm
View File

@ -147,14 +147,14 @@ libcdio.")
(define-public xorriso (define-public xorriso
(package (package
(name "xorriso") (name "xorriso")
(version "1.4.6") (version "1.4.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/xorriso/xorriso-" (uri (string-append "mirror://gnu/xorriso/xorriso-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"112p0ghwzxrcjbsir1n2jxhq103ckrw93wzvd55qqvzfgs674vsj")))) "10c44yr3dpmwxa7rf23mwfsy1bahny3jpcg9ig0xjv090jg0d0pc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("acl" ,acl) `(("acl" ,acl)

4
gnu/packages/certs.scm
View File

@ -74,7 +74,7 @@
(define-public nss-certs (define-public nss-certs
(package (package
(name "nss-certs") (name "nss-certs")
(version "3.32") (version "3.33")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (let ((version-with-underscores (uri (let ((version-with-underscores
@ -85,7 +85,7 @@
"nss-" version ".tar.gz"))) "nss-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"0dfkgvah0ji8b8lpxyy2w0b3lyz5ldmryii4z7j2bfwnrj0z7iim")))) "1r44qa4j7sri50mxxbnrpm6fxprwrhv76whi7bfq73j06syxmw4q"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out")) (outputs '("out"))
(native-inputs (native-inputs

26
gnu/packages/check.scm
View File

@ -7,7 +7,8 @@
;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org> ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 ng0 <ng0@infotropique.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -270,3 +271,26 @@ normally do not detect. The goal is to detect only real errors in the code
discovery, death tests, assertions, parameterized tests and XML test report discovery, death tests, assertions, parameterized tests and XML test report
generation.") generation.")
(license bsd-3))) (license bsd-3)))
(define-public cpputest
(package
(name "cpputest")
(version "3.8")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/cpputest/cpputest/releases/download/v"
version "/cpputest-" version ".tar.gz"))
(sha256
(base32
"0mk48xd3klyqi7wf3f4wn4zqxxzmvrhhl32r25jzrixzl72wq7f8"))))
(build-system gnu-build-system)
(native-inputs
`(("googletest" ,googletest)))
(home-page "https://cpputest.github.io/")
(synopsis "Unit testing and mocking framework for C/C++")
(description
"CppUTest is a C/C++ based unit xUnit test framework. It is written in
C++ but is used in C and C++ projects and frequently used in embedded systems
but it works for any C/C++ project.")
(license bsd-3)))

24
gnu/packages/ci.scm
View File

@ -187,8 +187,8 @@ their dependencies.")
(license l:gpl3+)))) (license l:gpl3+))))
(define-public cuirass (define-public cuirass
(let ((commit "6f85bc04f31ae5853ceaa0bb3e1dedfe8412a189") (let ((commit "9cfea9fe2e3ca6a3d1b832a6ec217426ec973c93")
(revision "7")) (revision "10"))
(package (package
(name "cuirass") (name "cuirass")
(version (string-append "0.0.1-" revision "." (string-take commit 7))) (version (string-append "0.0.1-" revision "." (string-take commit 7)))
@ -200,7 +200,7 @@ their dependencies.")
(file-name (string-append name "-" version)) (file-name (string-append name "-" version))
(sha256 (sha256
(base32 (base32
"1dglsa23z21m1s70420ar73qmg39fvdvwlz9xjz6lfp5s9mgzx15")))) "177klidmsw12kjk9dzawc0bqcwqlplgx45m87qpgjfx3cnk28i2b"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:modules ((guix build utils) '(#:modules ((guix build utils)
@ -216,7 +216,12 @@ their dependencies.")
(substitute* "Makefile.am" (substitute* "Makefile.am"
(("tests/repo.scm \\\\") "\\")) (("tests/repo.scm \\\\") "\\"))
#t)) #t))
(add-before 'configure 'bootstrap (add-after 'disable-repo-tests 'patch-/bin/sh
(lambda _
(substitute* "build-aux/git-version-gen"
(("#!/bin/sh") (string-append "#!" (which "sh"))))
#t))
(add-after 'patch-/bin/sh 'bootstrap
(lambda _ (zero? (system* "sh" "bootstrap")))) (lambda _ (zero? (system* "sh" "bootstrap"))))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -263,6 +268,17 @@ their dependencies.")
("automake" ,automake) ("automake" ,automake)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))
(native-search-paths
;; For HTTPS access, Cuirass itself honors these variables, with the
;; same semantics as Git and OpenSSL (respectively).
(list (search-path-specification
(variable "GIT_SSL_CAINFO")
(file-type 'regular)
(separator #f) ;single entry
(files '("etc/ssl/certs/ca-certificates.crt")))
(search-path-specification
(variable "SSL_CERT_DIR")
(files '("etc/ssl/certs")))))
(synopsis "Continuous integration system") (synopsis "Continuous integration system")
(description (description
"Cuirass is a continuous integration tool using GNU Guix. It is "Cuirass is a continuous integration tool using GNU Guix. It is

59
gnu/packages/cobol.scm Normal file
View File

@ -0,0 +1,59 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; 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 cobol)
#:use-module (gnu packages)
#:use-module (guix build-system gnu)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (gnu packages databases)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses))
(define-public gnucobol
(package
(name "gnucobol")
(version "2.2")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://gnu/gnucobol/gnucobol-"
version ".tar.xz"))
(sha256
(base32
"1814s1n95xax2dz938cf4fkcp0q94nkj1gjbdblbzpk9q92zq66w"))))
(arguments
'(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out")
"/lib"))))
(inputs
`(("bdb" ,bdb)
("gmp" ,gmp)
("ncurses" ,ncurses)))
(build-system gnu-build-system)
(home-page "https://savannah.gnu.org/projects/gnucobol/")
(synopsis "A modern COBOL compiler")
(description "GnuCOBOL is a free, modern COBOL compiler. GnuCOBOL
implements a substantial part of the COBOL 85, COBOL 2002 and COBOL 2014
standards and X/Open COBOL, as well as many extensions included in other
COBOL compilers (IBM COBOL, MicroFocus COBOL, ACUCOBOL-GT and others).
GnuCOBOL translates COBOL into C and compiles the translated code using
a native C compiler.")
(license gpl3+)))

8
gnu/packages/code.scm
View File

@ -193,16 +193,16 @@ COCOMO model or user-provided parameters.")
(define-public cloc (define-public cloc
(package (package
(name "cloc") (name "cloc")
(version "1.72") (version "1.74")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://github.com/AlDanial/cloc/releases/download/v" version "https://github.com/AlDanial/cloc/releases/download/" version
"/cloc-" version ".tar.gz")) "/cloc-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1gl7bxb4bi6pms0zzl133pzpfypvz57hk2cw7yf6rvs8b48kilnz")))) "0rq5xfiln1wlv3yr9mg18ax4gskbss786iqaf0v45iv6awyl5b2m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("coreutils" ,coreutils) `(("coreutils" ,coreutils)
@ -241,7 +241,7 @@ of source code in many programming languages. Given two versions of a code
base, cloc can compute differences in blank, comment, and source lines. base, cloc can compute differences in blank, comment, and source lines.
cloc contains code from David Wheeler's SLOCCount. Compared to SLOCCount, cloc contains code from David Wheeler's SLOCCount. Compared to SLOCCount,
cloc can handle a greater variety of programming langauges.") cloc can handle a greater variety of programming languages.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public the-silver-searcher (define-public the-silver-searcher

8
gnu/packages/commencement.scm
View File

@ -3,6 +3,7 @@
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -112,8 +113,7 @@
(define file-boot0 (define file-boot0
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package-with-explicit-inputs (package (package-with-explicit-inputs (package/inherit file
(inherit file)
(name "file-boot0")) (name "file-boot0"))
`(("make" ,gnu-make-boot0) `(("make" ,gnu-make-boot0)
,@%bootstrap-inputs) ,@%bootstrap-inputs)
@ -140,7 +140,7 @@
(define binutils-boot0 (define binutils-boot0
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package (inherit binutils) (package/inherit binutils
(name "binutils-cross-boot0") (name "binutils-cross-boot0")
(arguments (arguments
`(#:guile ,%bootstrap-guile `(#:guile ,%bootstrap-guile
@ -681,7 +681,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(define binutils-final (define binutils-final
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package (inherit binutils) (package/inherit binutils
(arguments (arguments
`(#:guile ,%bootstrap-guile `(#:guile ,%bootstrap-guile
#:implicit-inputs? #f #:implicit-inputs? #f

46
gnu/packages/compression.scm
View File

@ -12,7 +12,7 @@
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
@ -114,7 +114,7 @@ in compression.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'enter-source (add-after 'unpack 'enter-source
(lambda _ (chdir "contrib/minizip") #t)) (lambda _ (chdir "contrib/minizip") #t))
(add-before 'configure 'autoreconf (add-after 'enter-source 'autoreconf
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vif"))))))) (zero? (system* "autoreconf" "-vif")))))))
(native-inputs (native-inputs
@ -767,6 +767,28 @@ the LZ4 frame format.")
(define-public python2-lz4 (define-public python2-lz4
(package-with-python2 python-lz4)) (package-with-python2 python-lz4))
(define-public python-lzstring
(package
(name "python-lzstring")
(version "1.0.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "lzstring" version))
(sha256
(base32
"1d3ck454y41mii0gcjabpmp2skb7n0f9zk232gycqdv8z2jxakfm"))))
(build-system python-build-system)
(propagated-inputs
`(("python-future" ,python-future)))
(home-page "https://github.com/gkovacs/lz-string-python")
(synopsis "String compression")
(description "Lz-string is a string compressor library for Python.")
(license license:expat)))
(define-public python2-lzstring
(package-with-python2 python-lzstring))
(define-public squashfs-tools (define-public squashfs-tools
(package (package
(name "squashfs-tools") (name "squashfs-tools")
@ -963,7 +985,7 @@ respectively, based on the reference implementation from Google.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'enter-build-directory (add-after 'unpack 'enter-build-directory
(lambda _ (chdir "xdelta3"))) (lambda _ (chdir "xdelta3")))
(add-before 'configure 'autoconf (add-after 'enter-build-directory 'autoconf
(lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (lambda _ (zero? (system* "autoreconf" "-vfi")))))))
(home-page "http://xdelta.com") (home-page "http://xdelta.com")
(synopsis "Delta encoder for binary files") (synopsis "Delta encoder for binary files")
@ -1529,22 +1551,24 @@ manipulate, read, and write Zip archive files.")
(define-public libzip (define-public libzip
(package (package
(name "libzip") (name "libzip")
(version "1.2.0") (version "1.3.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://nih.at/libzip/libzip-" version ".tar.gz")) "https://nih.at/libzip/libzip-" version ".tar.xz"))
(patches (search-patches "libzip-CVE-2017-12858.patch"))
(sha256 (sha256
(base32 (base32
"17vxj2ffsxwh8lkc6801ppmwj15jp8q58rin76znxfbx88789ybc")))) "0wykw0q9dwdzx0gssi2dpgckx9ggr2spzc1amjnff6wi6kz6x4xa"))))
(arguments (arguments
`(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'patch-perl (add-after 'build 'remove-failing-tests
;; These tests are known to fail on 32-bit architectures.
;; see thread: https://nih.at/listarchive/libzip-discuss/msg00713.html
(lambda _ (lambda _
(substitute* "regress/runtest.in" (substitute* "regress/Makefile"
(("/usr/bin/env perl") (which "perl")))))))) (("encryption-nonrandom") "#encryption-nonrandom"))
#t)))))
(native-inputs (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)))
(inputs (inputs

6
gnu/packages/cpp.scm
View File

@ -45,12 +45,12 @@
'(#:phases '(#:phases
;; build scripts not in root of archive ;; build scripts not in root of archive
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'pre-configure (add-after 'unpack 'pre-configure
(lambda _ (lambda _
(chdir "Project/GNU/Library"))) (chdir "Project/GNU/Library")))
(add-before 'configure 'autogen (add-after 'pre-configure 'autogen
(lambda _ (lambda _
(zero? (system* "./autogen.sh"))))))) (zero? (system* "sh" "autogen.sh")))))))
(home-page "https://github.com/MediaArea/ZenLib") (home-page "https://github.com/MediaArea/ZenLib")
(synopsis "C++ utility library") (synopsis "C++ utility library")
(description "ZenLib is a C++ utility library. It includes classes for handling (description "ZenLib is a C++ utility library. It includes classes for handling

329
gnu/packages/cran.scm
View File

@ -23,6 +23,7 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build-system r) #:use-module (guix build-system r)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages machine-learning)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages statistics) #:use-module (gnu packages statistics)
@ -91,13 +92,13 @@ error stream.")
(define-public r-rcpp (define-public r-rcpp
(package (package
(name "r-rcpp") (name "r-rcpp")
(version "0.12.12") (version "0.12.13")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "Rcpp" version)) (uri (cran-uri "Rcpp" version))
(sha256 (sha256
(base32 "1byyqvlgb2p46p1gv243k73rk69fa8pa4l5m5asmckag2pkb2glz")))) (base32 "1bm84yc48475plgsnnbvzi6nzkixpnfw8ry86ax63f9g524asw55"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "http://www.rcpp.org") (home-page "http://www.rcpp.org")
(synopsis "Seamless R and C++ integration") (synopsis "Seamless R and C++ integration")
@ -202,14 +203,14 @@ on (non-orthogonal) variable vectors in scatterplots and biplots.")
(define-public r-shape (define-public r-shape
(package (package
(name "r-shape") (name "r-shape")
(version "1.4.2") (version "1.4.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "shape" version)) (uri (cran-uri "shape" version))
(sha256 (sha256
(base32 (base32
"0yk3cmsa57svcvbnm21pyr0s0qbhnllka8nmsg4yb41frjlqph66")))) "1v9xp60p813rnx41vchkh32qmcb4z2zp9l7r1a8a6f8aqylnq3vj"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "http://cran.r-project.org/web/packages/shape") (home-page "http://cran.r-project.org/web/packages/shape")
(synopsis "Functions for plotting graphical shapes") (synopsis "Functions for plotting graphical shapes")
@ -241,14 +242,14 @@ validation and filtering on the values, making options invisible or private.")
(define-public r-circlize (define-public r-circlize
(package (package
(name "r-circlize") (name "r-circlize")
(version "0.4.0") (version "0.4.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "circlize" version)) (uri (cran-uri "circlize" version))
(sha256 (sha256
(base32 (base32
"0p1zx1aawkblz48kzzfn5w1k3lbwv9wrk1k5gcfjrr2b4sz1pp5b")))) "1w7i3jgxgq510axglzmw54ma9kq7k4c86i9ccndz10mrwc51fji0"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-colorspace" ,r-colorspace) `(("r-colorspace" ,r-colorspace)
@ -271,14 +272,14 @@ patterns behind multiple dimensional data.")
(define-public r-powerlaw (define-public r-powerlaw
(package (package
(name "r-powerlaw") (name "r-powerlaw")
(version "0.70.0") (version "0.70.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "poweRlaw" version)) (uri (cran-uri "poweRlaw" version))
(sha256 (sha256
(base32 (base32
"1p2la3hslxq2xa8jkwvci6zcpn47cvyr9xqd5agp1riwwp2xw5gh")))) "04sr0nhdd1v915m0zf5gasznzgi08ykcy20kkwdw0l5mvvdbic8m"))))
(properties `((upstream-name . "poweRlaw"))) (properties `((upstream-name . "poweRlaw")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -459,14 +460,14 @@ quantities.")
(define-public r-reshape (define-public r-reshape
(package (package
(name "r-reshape") (name "r-reshape")
(version "0.8.6") (version "0.8.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "reshape" version)) (uri (cran-uri "reshape" version))
(sha256 (sha256
(base32 (base32
"1f1ngalc22knhdm9djv1m6abnjqpv1frdzxfkpakhph2l67bk7fq")))) "14ir3w4bb3bsz8jsak27nj7kpn227pdgr9653gjq5wc93rywi9ig"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-plyr" ,r-plyr) `(("r-plyr" ,r-plyr)
@ -505,14 +506,14 @@ package also provides a C++ API, that works with or without Rcpp.")
(define-public r-ggally (define-public r-ggally
(package (package
(name "r-ggally") (name "r-ggally")
(version "1.3.0") (version "1.3.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "GGally" version)) (uri (cran-uri "GGally" version))
(sha256 (sha256
(base32 (base32
"12ddab0nd0f9c7bb6cx3c22mliyvc8xsxv26aqz3cvfbla8crp3b")))) "02px7j28wzbhcgcwm2m0pxb6g7s5zvphl64ix55pkvag4m2ky57l"))))
(properties `((upstream-name . "GGally"))) (properties `((upstream-name . "GGally")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -556,14 +557,14 @@ most popular ones.")
(define-public r-sp (define-public r-sp
(package (package
(name "r-sp") (name "r-sp")
(version "1.2-4") (version "1.2-5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "sp" version)) (uri (cran-uri "sp" version))
(sha256 (sha256
(base32 (base32
"0crba3j00mb2xv2yk60rpa57gn97xq4ql3a6p9cjzqjxzv2cknk2")))) "09yydnacp33yx0kn537k96fjlbf75fjafqfknpa5gvci4l888bqd"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-lattice" ,r-lattice))) `(("r-lattice" ,r-lattice)))
@ -623,14 +624,14 @@ quantile mixture from L-moments and trimmed L-moments.")
(define-public r-distillery (define-public r-distillery
(package (package
(name "r-distillery") (name "r-distillery")
(version "1.0-2") (version "1.0-4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "distillery" version)) (uri (cran-uri "distillery" version))
(sha256 (sha256
(base32 (base32
"12m4cacvc18fd3aayc8iih5q6bwsmvf29b55fwp7vs8wp1h8nd8c")))) "1m0pgmlvk7bsb6q3kxagnq422babk61sf73naavac68v8x2q8fix"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "http://www.ral.ucar.edu/staff/ericg") (home-page "http://www.ral.ucar.edu/staff/ericg")
(synopsis "Functions for confidence intervals and object information") (synopsis "Functions for confidence intervals and object information")
@ -851,14 +852,14 @@ data). Weighted versions of MLE, MME and QME are available.")
(define-public r-energy (define-public r-energy
(package (package
(name "r-energy") (name "r-energy")
(version "1.7-0") (version "1.7-2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "energy" version)) (uri (cran-uri "energy" version))
(sha256 (sha256
(base32 (base32
"1g4hqi6mgsnd1w4q7dd2m40ljh2jdmvad91ksbq9fscnrqpvji1x")))) "19c7bgjnm4ggf7w5mk64c5shkma3sa9wc8x117iqv7pk1bvvyy3p"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-boot" ,r-boot) `(("r-boot" ,r-boot)
@ -904,14 +905,14 @@ George Marsaglia are included.")
(define-public r-ksamples (define-public r-ksamples
(package (package
(name "r-ksamples") (name "r-ksamples")
(version "1.2-6") (version "1.2-7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "kSamples" version)) (uri (cran-uri "kSamples" version))
(sha256 (sha256
(base32 (base32
"1pbam0zqq44slpxdgl2s2fsfdgl7i0pgm8bzlvnm0fy0na24bgdj")))) "0f19rjngk0lg6s8c6h5l55qpxp8sl4vxj3kpi05cizzncny9b9bj"))))
(properties `((upstream-name . "kSamples"))) (properties `((upstream-name . "kSamples")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -928,3 +929,291 @@ sampling from populations, given the observed tie pattern. Except for Steel's
test and the JT test it also combines these tests across several blocks of test and the JT test it also combines these tests across several blocks of
samples.") samples.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public r-cvst
(package
(name "r-cvst")
(version "0.2-1")
(source
(origin
(method url-fetch)
(uri (cran-uri "CVST" version))
(sha256
(base32
"17xacyi8cf37rr2xswx96qy7pwkaqq394awdlswykz3qlyzx4zx2"))))
(properties `((upstream-name . "CVST")))
(build-system r-build-system)
(propagated-inputs
`(("r-kernlab" ,r-kernlab)
("r-matrix" ,r-matrix)))
(home-page "http://cran.r-project.org/web/packages/CVST")
(synopsis "Fast cross-validation via sequential testing")
(description
"This package implements the fast cross-validation via sequential
testing (CVST) procedure. CVST is an improved cross-validation procedure
which uses non-parametric testing coupled with sequential analysis to
determine the best parameter set on linearly increasing subsets of the data.
Additionally to the CVST the package contains an implementation of the
ordinary k-fold cross-validation with a flexible and powerful set of helper
objects and methods to handle the overall model selection process. The
implementations of the Cochran's Q test with permutations and the sequential
testing framework of Wald are generic and can therefore also be used in other
contexts.")
(license license:gpl2+)))
(define-public r-lava
(package
(name "r-lava")
(version "1.5.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "lava" version))
(sha256
(base32
"1vcm04h9i39gmf2prl5d4j4il4gs6skzr6y2fvl1vn4hklna87f4"))))
(build-system r-build-system)
(propagated-inputs
`(("r-numderiv" ,r-numderiv)
("r-survival" ,r-survival)))
(home-page "https://github.com/kkholst/lava")
(synopsis "Latent variable models")
(description
"This package provides tools for the estimation and simulation of latent
variable models.")
(license license:gpl3)))
(define-public r-drr
(package
(name "r-drr")
(version "0.0.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "DRR" version))
(sha256
(base32
"1scfwp6ry6apxzqjclsmn2frxp9qfw6zxsxn5w0j0q3sz42hz1h2"))))
(properties `((upstream-name . "DRR")))
(build-system r-build-system)
(propagated-inputs
`(("r-cvst" ,r-cvst)
("r-kernlab" ,r-kernlab)
("r-matrix" ,r-matrix)))
(home-page "http://cran.r-project.org/web/packages/DRR")
(synopsis "Dimensionality reduction via regression")
(description
"This package provides an implementation of dimensionality reduction via
regression using Kernel Ridge Regression.")
(license license:gpl3)))
(define-public r-prodlim
(package
(name "r-prodlim")
(version "1.6.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "prodlim" version))
(sha256
(base32
"0m51rkivx1zr6whdqwj66jpnkmp4385m06kkha3dp8qqf4jna9iz"))))
(build-system r-build-system)
(propagated-inputs
`(("r-kernsmooth" ,r-kernsmooth)
("r-lava" ,r-lava)
("r-rcpp" ,r-rcpp)
("r-survival" ,r-survival)))
(home-page "http://cran.r-project.org/web/packages/prodlim")
(synopsis "Product-limit estimation for censored event history analysis")
(description
"This package provides a fast and user-friendly implementation of
nonparametric estimators for censored event history (survival) analysis with
the Kaplan-Meier and Aalen-Johansen methods.")
(license license:gpl2+)))
(define-public r-dimred
(package
(name "r-dimred")
(version "0.1.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "dimRed" version))
(sha256
(base32
"0fasca5fsbrxdwv30hch7vb9snb844l7l8p5fjf239dq45xfy37v"))))
(properties `((upstream-name . "dimRed")))
(build-system r-build-system)
(propagated-inputs `(("r-drr" ,r-drr)))
(home-page "https://github.com/gdkrmr/dimRed")
(synopsis "Framework for dimensionality reduction")
(description
"This package provides a collection of dimensionality reduction
techniques from R packages and provides a common interface for calling the
methods.")
(license license:gpl3)))
(define-public r-timedate
(package
(name "r-timedate")
(version "3012.100")
(source
(origin
(method url-fetch)
(uri (cran-uri "timeDate" version))
(sha256
(base32
"0cn4h23y2y2bbg62qgm79xx4cvfla5xbpmi9hbdvkvpmm5yfyqk2"))))
(properties `((upstream-name . "timeDate")))
(build-system r-build-system)
(home-page "https://www.rmetrics.org")
(synopsis "Chronological and calendar objects")
(description
"This package provides an environment for teaching \"Financial
Engineering and Computational Finance\" and for managing chronological and
calendar objects.")
(license license:gpl2+)))
(define-public r-ddalpha
(package
(name "r-ddalpha")
(version "1.3.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "ddalpha" version))
(sha256
(base32
"0pczw9543y7f92m7gyk7rxcjn8vsjaldc5vl0r56ywip9i374zbh"))))
(build-system r-build-system)
(propagated-inputs
`(("r-bh" ,r-bh)
("r-class" ,r-class)
("r-mass" ,r-mass)
("r-rcpp" ,r-rcpp)
("r-robustbase" ,r-robustbase)
("r-sfsmisc" ,r-sfsmisc)))
(native-inputs
`(("gfortran" ,gfortran)))
(home-page "http://cran.r-project.org/web/packages/ddalpha")
(synopsis "Depth-Based classification and calculation of data depth")
(description
"This package contains procedures for depth-based supervised learning,
which are entirely non-parametric, in particular the DDalpha-procedure (Lange,
Mosler and Mozharovskyi, 2014). The training data sample is transformed by a
statistical depth function to a compact low-dimensional space, where the final
classification is done. It also offers an extension to functional data and
routines for calculating certain notions of statistical depth functions. 50
multivariate and 5 functional classification problems are included.")
(license license:gpl2)))
(define-public r-gower
(package
(name "r-gower")
(version "0.1.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "gower" version))
(sha256
(base32
"1mbrj1lam3jfbby2j32shmmj5cn09zx3rkxbamq7q8sdg39b54gb"))))
(build-system r-build-system)
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/markvanderloo/gower")
(synopsis "Gower's distance")
(description
"This package provides tools to compute Gower's distance (or similarity)
coefficient between records, and to compute the top-n matches between records.
Core algorithms are executed in parallel on systems supporting OpenMP.")
(license license:gpl3)))
(define-public r-rcpproll
(package
(name "r-rcpproll")
(version "0.2.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "RcppRoll" version))
(sha256
(base32
"19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"))))
(properties `((upstream-name . "RcppRoll")))
(build-system r-build-system)
(propagated-inputs
`(("r-rcpp" ,r-rcpp)))
(home-page "http://cran.r-project.org/web/packages/RcppRoll")
(synopsis "Efficient rolling and windowed operations")
(description
"This package provides fast and efficient routines for common rolling /
windowed operations. Routines for the efficient computation of windowed mean,
median, sum, product, minimum, maximum, standard deviation and variance are
provided.")
(license license:gpl2+)))
(define-public r-ipred
(package
(name "r-ipred")
(version "0.9-6")
(source
(origin
(method url-fetch)
(uri (cran-uri "ipred" version))
(sha256
(base32
"1vrw1pqcpnc04x1r2h9grdfm6bivs358sww5gg90jwlvxcw69lxq"))))
(build-system r-build-system)
(propagated-inputs
`(("r-class" ,r-class)
("r-mass" ,r-mass)
("r-nnet" ,r-nnet)
("r-prodlim" ,r-prodlim)
("r-rpart" ,r-rpart)
("r-survival" ,r-survival)))
(home-page "http://cran.r-project.org/web/packages/ipred")
(synopsis "Improved predictors")
(description
"This package provides improved predictive models by indirect
classification and bagging for classification, regression and survival
problems as well as resampling based estimators of prediction error.")
(license license:gpl2+)))
(define-public r-recipes
(package
(name "r-recipes")
(version "0.1.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "recipes" version))
(sha256
(base32
"0rydk403qihxmcv3zz323r3ywk4g1v7ibvj452rxhm0z22sqk9kb"))))
(build-system r-build-system)
(propagated-inputs
`(("r-ddalpha" ,r-ddalpha)
("r-dimred" ,r-dimred)
("r-dplyr" ,r-dplyr)
("r-gower" ,r-gower)
("r-ipred" ,r-ipred)
("r-lubridate" ,r-lubridate)
("r-magrittr" ,r-magrittr)
("r-purrr" ,r-purrr)
("r-rcpproll" ,r-rcpproll)
("r-rlang" ,r-rlang)
("r-tibble" ,r-tibble)
("r-tidyselect" ,r-tidyselect)
("r-timedate" ,r-timedate)))
(home-page "https://github.com/topepo/recipes")
(synopsis "Preprocessing tools to create design matrices")
(description
"Recipes is an extensible framework to create and preprocess design
matrices. Recipes consist of one or more data manipulation and analysis
\"steps\". Statistical parameters for the steps can be estimated from an
initial data set and then applied to other data sets. The resulting design
matrices can then be used as inputs into statistical or machine learning
models.")
(license license:gpl2)))

41
gnu/packages/crypto.scm
View File

@ -58,25 +58,56 @@
(define-public libsodium (define-public libsodium
(package (package
(name "libsodium") (name "libsodium")
(version "1.0.13") (version "1.0.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append (uri (list (string-append
"http://download.libsodium.org/libsodium/" "https://download.libsodium.org/libsodium/"
"releases/libsodium-" version ".tar.gz") "releases/libsodium-" version ".tar.gz")
(string-append (string-append
"https://download.libsodium.org/libsodium/" "https://download.libsodium.org/libsodium/"
"releases/old/libsodium-" version ".tar.gz"))) "releases/old/libsodium-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1z93wfg4k5svg8yck6cgdr6ysj91kbpn03nyzwxanncy3b5sq4ww")))) "1rvylybhxyn6ap3hrcingsl737zrqg12l7r91ns93j7xjz889z1w"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis "Portable NaCl-based crypto library") (synopsis "Portable NaCl-based crypto library")
(description (description
"Sodium is a new easy-to-use high-speed software library for network "Sodium is a new easy-to-use high-speed software library for network
communication, encryption, decryption, signatures, etc.") communication, encryption, decryption, signatures, etc.")
(license license:isc) (license license:isc)
(home-page "http://libsodium.org"))) (home-page "https://libsodium.org")))
(define-public libmd
(package
(name "libmd")
(version "0.0.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://archive.hadrons.org/software/libmd/libmd-"
version
".tar.xz"))
(sha256
(base32
"121s73pgbqsnmy6xblbrkj9y44c5zzzpf2hcmh6zvcvg4dk26gzx"))))
(build-system gnu-build-system)
(synopsis "Message Digest functions from BSD systems")
(description
"The currently provided message digest algorithms are:
@itemize
@item MD2
@item MD4
@item MD5
@item RIPEMD-160
@item SHA-1
@item SHA-2 (SHA-256, SHA-384 and SHA-512)
@end itemize")
(license (list license:bsd-3
license:bsd-2
license:isc
license:public-domain))
(home-page "https://www.hadrons.org/software/libmd/")))
(define-public signify (define-public signify
(package (package
@ -161,7 +192,7 @@ OpenBSD tool of the same name.")
(arguments (arguments
`(#:configure-flags '("--disable-tools" "--disable-python") `(#:configure-flags '("--disable-tools" "--disable-python")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'configure 'autoconf (add-after 'unpack 'autoconf
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vfi"))))))) (zero? (system* "autoreconf" "-vfi")))))))
(home-page "https://github.com/savoirfairelinux/opendht/") (home-page "https://github.com/savoirfairelinux/opendht/")

124
gnu/packages/cups.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
@ -27,10 +27,14 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages avahi) #:use-module (gnu packages avahi)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages groff)
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (gnu packages autotools) #:use-module (gnu packages perl)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages scanner) #:use-module (gnu packages scanner)
#:use-module (gnu packages image) #:use-module (gnu packages image)
@ -445,3 +449,119 @@ device-specific programs to convert and print many types of files.")
;; TODO: Make hp-setup find python-dbus. ;; TODO: Make hp-setup find python-dbus.
("python-dbus" ,python-dbus))) ("python-dbus" ,python-dbus)))
(native-inputs `(("pkg-config" ,pkg-config))))) (native-inputs `(("pkg-config" ,pkg-config)))))
(define-public foomatic-filters
(package
(name "foomatic-filters")
(version "4.0.12")
(source (origin
(method url-fetch)
(uri (string-append
"http://www.openprinting.org/download/foomatic/"
name "-" version ".tar.gz"))
(sha256
(base32
"17w26r15094j4fqifa7f7i7jad4gsy9zdlq69kffrykcw31qx3q8"))
(patches
(search-patches "foomatic-filters-CVE-2015-8327.patch"
"foomatic-filters-CVE-2015-8560.patch"))))
(build-system gnu-build-system)
(home-page
"https://wiki.linuxfoundation.org/openprinting/database/foomatic")
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)))
(inputs
`(("dbus" ,dbus)
("a2ps" ,a2ps)))
(arguments
'( ;; Specify the installation directories.
#:configure-flags (list (string-append "ac_cv_path_CUPS_BACKENDS="
(assoc-ref %outputs "out")
"/lib/cups/backend")
(string-append "ac_cv_path_CUPS_FILTERS="
(assoc-ref %outputs "out")
"/lib/cups/filter")
(string-append "ac_cv_path_PPR_INTERFACES="
(assoc-ref %outputs "out")
"/lib/ppr/interfaces")
(string-append "ac_cv_path_PPR_LIB="
(assoc-ref %outputs "out")
"/lib/ppr/lib")
;; For some reason these are misdiagnosed.
"ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes")
#:test-target "tests"))
(synopsis "Convert PostScript to the printer's native format")
(description
"This package contains filter scripts used by the printer spoolers to
convert the incoming PostScript data into the printer's native format using a
printer/driver specific, but spooler-independent PPD file.")
(license license:gpl2+)))
(define-public foo2zjs
(package
;; The tarball is called "foo2zjs", but the web page talks about
;; "foo2xqx". Go figure!
(name "foo2zjs")
(version "201709")
(source (origin
(method url-fetch)
;; XXX: This is an unversioned URL!
(uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz")
(sha256
(base32
"0amjj3jr6s6h7crzxyx11v31sj0blz7k5c2vycz4gn8cxlmk3c7w"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(substitute* (find-files "." "^Makefile$")
;; Set the installation directory.
(("^PREFIX[[:blank:]]*=.*$")
(string-append "PREFIX = "
(assoc-ref outputs "out")
"\n"))
(("^UDEVBIN[[:blank:]]*=.*$")
"UDEVBIN = $(PREFIX)/bin\n")
;; Don't try to chown/chgrp the installed files.
(("-oroot")
"")
(("-glp")
"")
;; Placate the dependency checks.
(("/usr/include/stdio.h")
"/etc/passwd")
(("/usr/")
"$(PREFIX)/")
;; Ensure fixed timestamps in man pages.
(("^MODTIME[[:blank:]]*=.*$")
"MODTIME = echo Thu Jan 01 01:00:00 1970\n"))
#t))
(add-after 'install 'remove-pdf
(lambda* (#:key outputs #:allow-other-keys)
;; Remove 'manual.pdf' which is (1) useless (it's a
;; concatenation of man pages), and (2) not
;; bit-reproducible due to <https://bugs.gnu.org/27593>.
(let ((out (assoc-ref outputs "out")))
(for-each delete-file
(find-files out "^manual\\.pdf$"))
#t))))
#:parallel-build? #f ;broken makefile
#:tests? #f ;no tests
#:make-flags '("CC=gcc")))
(inputs
`(("ghostscript" ,ghostscript)
("foomatic-filters" ,foomatic-filters))) ;for 'foomatic-rip'
(native-inputs
`(("bc" ,bc)
("groff" ,groff)))
(home-page "http://foo2xqx.rkkda.com/")
(synopsis "Printer driver for XQX stream protocol")
(description
"This package provides a printer driver notably for the ZJS and XQX
protocols, which cover printers made by Konica, HP (LaserJet), Oki, Samsung,
and more. See @file{README} for details.")
(license license:gpl2+)))

115
gnu/packages/databases.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2014, 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2014, 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015, 2016 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
@ -18,6 +18,7 @@
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -52,6 +53,7 @@
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages time)
#:use-module (gnu packages jemalloc) #:use-module (gnu packages jemalloc)
#:use-module (gnu packages language) #:use-module (gnu packages language)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
@ -66,6 +68,7 @@
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages rdf) #:use-module (gnu packages rdf)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages ruby)
#:use-module (gnu packages tcl) #:use-module (gnu packages tcl)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
@ -75,6 +78,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system ruby)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
@ -115,9 +119,9 @@
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'generate-configure (add-after 'unpack 'generate-configure
(lambda _ (lambda _
(zero? (system* "./autogen.sh"))))))) (zero? (system* "sh" "autogen.sh")))))))
;; http://www.4store.org has been down for a while now. ;; http://www.4store.org has been down for a while now.
(home-page "https://github.com/garlik/4store") (home-page "https://github.com/garlik/4store")
(synopsis "Clustered RDF storage and query engine") (synopsis "Clustered RDF storage and query engine")
@ -254,6 +258,45 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
"--enable-cxx")))) "--enable-cxx"))))
%standard-phases))))) %standard-phases)))))
(define-public es-dump-restore
(package
(name "es-dump-restore")
(version "2.1.0")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "es_dump_restore" version))
(sha256
(base32
"020yk7f1hw48clmf5501z3xv9shsdchyymcv0y2cci2c1xvr1mim"))))
(build-system ruby-build-system)
(arguments
'(#:tests? #f ;; No testsuite.
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-bin-es_dump_restore
(lambda* (#:key outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out")
"/bin/es_dump_restore")
`("GEM_PATH" ":" prefix (,(string-append
(getenv "GEM_PATH")
":"
(getenv "GEM_HOME")))))
#t)))))
(propagated-inputs
`(("ruby-httpclient" ,ruby-httpclient)
("ruby-multi-json" ,ruby-multi-json)
("ruby-progress_bar" ,ruby-progress_bar)
("ruby-rubyzip" ,ruby-rubyzip)
("ruby-thor" ,ruby-thor)))
(synopsis "Utility for dumping and restoring ElasticSearch indexes")
(description
"This package provides a utility for dumping the contents of an
ElasticSearch index to a compressed file and restoring the dumpfile back to an
ElasticSearch server")
(home-page "https://github.com/patientslikeme/es_dump_restore")
(license license:expat)))
(define-public leveldb (define-public leveldb
(package (package
(name "leveldb") (name "leveldb")
@ -371,12 +414,7 @@ applications.")
(for-each delete-file (for-each delete-file
(find-files (string-append out "/bin") (find-files (string-append out "/bin")
"_embedded$")) "_embedded$"))
#t)))) #t))))))
;; On aarch64 the test suite runs out of memory and fails.
,@(if (string-prefix? "aarch64-linux"
(or (%current-target-system) (%current-system)))
'(#:tests? #f)
'())))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
("perl" ,perl))) ("perl" ,perl)))
@ -474,14 +512,14 @@ as a drop-in replacement of MySQL.")
(define-public postgresql (define-public postgresql
(package (package
(name "postgresql") (name "postgresql")
(version "9.6.4") (version "9.6.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v" (uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2")) version "/postgresql-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"04yffrrmn85k25n3nq389aa9c1j8mkimrf889kayl772h9nv2fib")))) "0k3ls2x182jz6djjiqj9kycddabdl2gk1y1ajq1vipnxwfki5nh6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--with-uuid=e2fs") `(#:configure-flags '("--with-uuid=e2fs")
@ -1568,7 +1606,7 @@ for ODBC.")
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'autoreconf (add-after 'unpack 'autoreconf
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vfi"))))))) (zero? (system* "autoreconf" "-vfi")))))))
(home-page "http://mdbtools.sourceforge.net/") (home-page "http://mdbtools.sourceforge.net/")
@ -1626,3 +1664,56 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
(define-public python2-lmdb (define-public python2-lmdb
(package-with-python2 python-lmdb)) (package-with-python2 python-lmdb))
(define-public python-orator
(package
(name "python-orator")
(version "0.9.7")
(source (origin
(method url-fetch)
(uri (pypi-uri "orator" version))
(sha256
(base32
"14r58z64fdp76ixnvmi4lni762b405ynmsx6chr1qihs3yl9zn6c"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'loosen-dependencies
;; Tests are not actually run since they are not included with the
;; distributed package, but dependencies are checked.
(lambda _
(substitute* "setup.py"
((",<.*'") "'")
(("flexmock==0.9.7") "flexmock")
;; The pytest-mock package is out of date, so we remove minimum
;; version requirement.
(("pytest-mock.*'") "pytest-mock'"))
#t)))))
(native-inputs
`(("python-pytest-mock" ,python-pytest-mock)
("python-pytest" ,python-pytest-3.0)
("python-flexmock" ,python-flexmock)))
(propagated-inputs
`(("python-backpack" ,python-backpack)
("python-blinker" ,python-blinker)
("python-cleo" ,python-cleo)
("python-faker" ,python-faker)
("python-inflection" ,python-inflection)
("python-lazy-object-proxy" ,python-lazy-object-proxy)
("python-pendulum" ,python-pendulum)
("python-pyaml" ,python-pyaml)
("python-pygments" ,python-pygments)
("python-simplejson" ,python-simplejson)
("python-six" ,python-six)
("python-wrapt" ,python-wrapt)))
(home-page "https://orator-orm.com/")
(synopsis "ActiveRecord ORM for Python")
(description
"Orator provides a simple ActiveRecord-like Object Relational Mapping
implementation for Python.")
(license license:expat)
(properties `((python2-variant . ,(delay python2-orator))))))
(define-public python2-orator
(package-with-python2 (strip-python2-variant python-orator)))

4
gnu/packages/dav.scm
View File

@ -55,13 +55,13 @@ clients.")
(define-public vdirsyncer (define-public vdirsyncer
(package (package
(name "vdirsyncer") (name "vdirsyncer")
(version "0.16.1") (version "0.16.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri name version)) (uri (pypi-uri name version))
(sha256 (sha256
(base32 (base32
"0pnsb9h4r0hhmqhzx9nbrd7jawir9ysrh3wrrkhzi0ssarmxyp67")))) "19xqzxcgmpm2z56l2d4a1n4sqmhrnzfwx3d9avfzgldwyhlrz0da"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases

2
gnu/packages/debug.scm
View File

@ -319,7 +319,7 @@ down the road.")
(add-before 'configure 'repack-make (add-before 'configure 'repack-make
(lambda _ (lambda _
(zero? (system* "tar" "cJf" "./make.tar.xz" ,make-dir)))) (zero? (system* "tar" "cJf" "./make.tar.xz" ,make-dir))))
(add-before 'configure 'bootstrap (add-after 'unpack 'bootstrap
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vfi")))))))) (zero? (system* "autoreconf" "-vfi"))))))))
(home-page "https://github.com/losalamos/stress-make") (home-page "https://github.com/losalamos/stress-make")

25
gnu/packages/disk.scm
View File

@ -8,6 +8,7 @@
;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -30,6 +31,7 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix build-system python)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
@ -214,7 +216,7 @@ to recover data more efficiently by only reading the necessary blocks.")
`(#:make-flags (list (string-append "PREFIX=" %output) `(#:make-flags (list (string-append "PREFIX=" %output)
"CC=gcc"))) "CC=gcc")))
(native-inputs (native-inputs
`(("xxd" ,vim))) ; for tests `(("xxd" ,xxd))) ; for tests
(home-page "https://github.com/dosfstools/dosfstools") (home-page "https://github.com/dosfstools/dosfstools")
(synopsis "Utilities for making and checking MS-DOS FAT file systems") (synopsis "Utilities for making and checking MS-DOS FAT file systems")
(description (description
@ -344,7 +346,7 @@ and can dramatically shorten the lifespan of the drive if left unchecked.")
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("intltool" ,intltool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "https://sourceforge.net/projects/gparted/") (home-page "https://gparted.org/")
(synopsis "Partition editor to graphically manage disk partitions") (synopsis "Partition editor to graphically manage disk partitions")
(description "GParted is a GNOME partition editor for creating, (description "GParted is a GNOME partition editor for creating,
reorganizing, and deleting disk partitions. It uses libparted from the parted reorganizing, and deleting disk partitions. It uses libparted from the parted
@ -353,6 +355,25 @@ permit managing file systems not included in libparted.")
;; The home page says GPLv2, but the source code says GPLv2+. ;; The home page says GPLv2, but the source code says GPLv2+.
(license license:gpl2+))) (license license:gpl2+)))
(define-public pydf
(package
(name "pydf")
(version "12")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pydf" version))
(sha256
(base32
"0f8ly8xyp93i2hm9c0qjqd4y86nz73axw2f09z01mszwmg1sfivz"))))
(build-system python-build-system)
(home-page "http://kassiopeia.juls.savba.sk/~garabik/software/pydf/")
(synopsis "Colourised @command{df} clone")
(description "All-singing, all-dancing, fully colourised @command{df} clone
written in Python. It displays the amount of disk space available on the
mounted filesystems, using different colours for different types of file
systems. Output format is completely customizable.")
(license license:public-domain)))
(define-public f3 (define-public f3
(package (package

16
gnu/packages/display-managers.scm
View File

@ -132,23 +132,24 @@ Qt-style API for Wayland clients.")
(define-public sddm (define-public sddm
(package (package
(name "sddm") (name "sddm")
(version "0.14.0") (version "0.15.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://github.com/sddm/sddm" "https://github.com/sddm/sddm"
"/releases/download/v" version "/" "/releases/download/v" version "/"
"sddm-" version ".tar.xz")) "sddm-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0y3pn8g2qj7q20zkmbasrfsj925lfzizk63sfrvzf84bc5c84d3y")))) "0x1igkjm3k8q26xbmg0qah1fc2pn2sfc675w0xg42x7ncrdiw8d4"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("qttools" ,qttools))) ("qttools" ,qttools)))
(inputs (inputs
`(("glib" ,glib) `(("elogind" ,elogind)
("glib" ,glib)
("libxcb" ,libxcb) ("libxcb" ,libxcb)
("libxkbcommon" ,libxkbcommon) ("libxkbcommon" ,libxkbcommon)
("linux-pam" ,linux-pam) ("linux-pam" ,linux-pam)
@ -163,6 +164,8 @@ Qt-style API for Wayland clients.")
;; Option added by enable wayland greeters PR ;; Option added by enable wayland greeters PR
"-DENABLE_WAYLAND=ON" "-DENABLE_WAYLAND=ON"
"-DENABLE_PAM=ON" "-DENABLE_PAM=ON"
;; Both flags are required for elogind support.
"-DNO_SYSTEMD=ON" "-DUSE_ELOGIND=ON"
"-DCONFIG_FILE=/etc/sddm.conf" "-DCONFIG_FILE=/etc/sddm.conf"
;; Set path to /etc/login.defs ;; Set path to /etc/login.defs
;; Alternatively use -DUID_MIN and -DUID_MAX ;; Alternatively use -DUID_MIN and -DUID_MAX
@ -180,6 +183,11 @@ Qt-style API for Wayland clients.")
(guix build qt-utils)) (guix build qt-utils))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'embed-loginctl-reference
(lambda _
(substitute* "CMakeLists.txt"
(("/usr/bin/loginctl") (which "loginctl")))
#t))
(add-after 'install 'wrap-programs (add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))

4
gnu/packages/django.scm
View File

@ -31,13 +31,13 @@
(define-public python-django (define-public python-django
(package (package
(name "python-django") (name "python-django")
(version "1.10.7") (version "1.10.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Django" version)) (uri (pypi-uri "Django" version))
(sha256 (sha256
(base32 (base32
"1f5hnn2dzfr5szk4yc47bs4kk2nmrayjcvgpqi2s4l13pjfpfgar")))) "1fwqqh2zbcy9dy0lnvk338s11llnnfz2k56bf84w0wv56ayq7vyl"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases

8
gnu/packages/djvu.scm
View File

@ -34,6 +34,14 @@
(base32 (base32
"0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6")))) "0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'reproducible
(lambda _
;; Ensure there are no timestamps in .svgz files.
(substitute* "desktopfiles/Makefile.in"
(("gzip") "gzip -n"))
#t)))))
(home-page "http://djvu.sourceforge.net/") (home-page "http://djvu.sourceforge.net/")
(synopsis "Implementation of DjVu, the document format") (synopsis "Implementation of DjVu, the document format")
(description "DjVuLibre is an implementation of DjVu, (description "DjVuLibre is an implementation of DjVu,

8
gnu/packages/dns.scm
View File

@ -181,7 +181,7 @@ high-volume and high-reliability applications. The name BIND stands for
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'autoreconf (add-after 'unpack 'autoreconf
(lambda _ (lambda _
;; Re-generate build files due to unbundling ltdl. ;; Re-generate build files due to unbundling ltdl.
;; TODO: Prevent generating new libltdl and building it. ;; TODO: Prevent generating new libltdl and building it.
@ -229,7 +229,7 @@ servers is included, and an up-to-date version is available at
#:tests? #f #:tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'create-configure (add-after 'unpack 'create-configure
(lambda _ (lambda _
(zero? (system* "make" "configure"))))))) (zero? (system* "make" "configure")))))))
(native-inputs (native-inputs
@ -483,14 +483,14 @@ Extensions} (DNSSEC).")
(define-public knot (define-public knot
(package (package
(name "knot") (name "knot")
(version "2.5.3") (version "2.5.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-dns/" (uri (string-append "https://secure.nic.cz/files/knot-dns/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"13lxxnnw0v7s0q648grz87bwlfwjh5sfbj1qax7jdklalqqy52np")) "1bwv2a290inkjb5x9a9sahls39rgaqyq9dwfrk1ilmzy9nmls87f"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

2
gnu/packages/documentation.scm
View File

@ -4,7 +4,7 @@
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

17
gnu/packages/dunst.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015, 2017 Alex Kost <alezost@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -32,15 +32,16 @@
(define-public dunst (define-public dunst
(package (package
(name "dunst") (name "dunst")
(version "1.1.0") (version "1.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"http://knopwob.org/public/dunst-release/dunst-" "https://github.com/dunst-project/dunst/archive/v"
version ".tar.bz2")) version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0w3hilzwanwsp4q6dxbdj6l0mvpg4fq02wf8isll8kmbx9kz2ay7")))) "1bf5fmmj79wlwi8wzir3rd8czyrxfx16w8q7c957123yz1g5ph53"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no check target '(#:tests? #f ; no check target
@ -55,15 +56,15 @@
(inputs (inputs
`(("dbus" ,dbus) `(("dbus" ,dbus)
("glib" ,glib) ("glib" ,glib)
("gtk" ,gtk+-2)
("cairo" ,cairo) ("cairo" ,cairo)
("pango" ,pango) ("pango" ,pango)
("libx11" ,libx11) ("libx11" ,libx11)
("libxext" ,libxext)
("libxft" ,libxft)
("libxscrnsaver" ,libxscrnsaver) ("libxscrnsaver" ,libxscrnsaver)
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("libxrandr" ,libxrandr)
("libxdg-basedir" ,libxdg-basedir))) ("libxdg-basedir" ,libxdg-basedir)))
(home-page "http://knopwob.org/dunst") (home-page "https://dunst-project.org/")
(synopsis "Customizable and lightweight notification daemon") (synopsis "Customizable and lightweight notification daemon")
(description (description
"Dunst is a highly configurable and minimalistic notification daemon. "Dunst is a highly configurable and minimalistic notification daemon.

12
gnu/packages/ebook.scm
View File

@ -72,7 +72,7 @@
(define-public calibre (define-public calibre
(package (package
(name "calibre") (name "calibre")
(version "3.0.0") (version "3.6.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -81,21 +81,19 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1zhk7bvgr973dd18x4wp48kzai29qqqi5qcy72sxc4wcbk2sbnkw")) "0vp2nds4b5xbchsh1rpc1q7093gd26dnw7mgbnax97dcchvlc4sc"))
;; Remove non-free or doubtful code, see ;; Remove non-free or doubtful code, see
;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
(delete-file-recursively "src/calibre/ebooks/markdown") (delete-file-recursively "src/calibre/ebooks/markdown")
(delete-file-recursively "src/unrar")
(delete-file "src/odf/thumbnail.py") (delete-file "src/odf/thumbnail.py")
(delete-file-recursively "resources/fonts/liberation") (delete-file-recursively "resources/fonts/liberation")
(substitute* (find-files "." "\\.py") (substitute* (find-files "." "\\.py")
(("calibre\\.ebooks\\.markdown") "markdown")) (("calibre\\.ebooks\\.markdown") "markdown"))
#t)) #t))
(patches (search-patches "calibre-drop-unrar.patch" (patches (search-patches "calibre-use-packaged-feedparser.patch"
"calibre-use-packaged-feedparser.patch"
"calibre-no-updates-dialog.patch")))) "calibre-no-updates-dialog.patch"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
@ -129,6 +127,7 @@
("python2-dbus" ,python2-dbus) ("python2-dbus" ,python2-dbus)
("python2-dnspython" ,python2-dnspython) ("python2-dnspython" ,python2-dnspython)
("python2-feedparser" ,python2-feedparser) ("python2-feedparser" ,python2-feedparser)
("python2-html5-parser" ,python2-html5-parser)
("python2-lxml" ,python2-lxml) ("python2-lxml" ,python2-lxml)
("python2-markdown" ,python2-markdown) ("python2-markdown" ,python2-markdown)
("python2-mechanize" ,python2-mechanize) ("python2-mechanize" ,python2-mechanize)
@ -140,6 +139,9 @@
("python2-pyqt" ,python2-pyqt) ("python2-pyqt" ,python2-pyqt)
("python2-sip" ,python2-sip) ("python2-sip" ,python2-sip)
("python2-regex" ,python2-regex) ("python2-regex" ,python2-regex)
;; python2-unrardll is needed for decompressing RAR files.
;; A program called 'pdf2html' is needed for reading PDF books
;; in the web interface.
("sqlite" ,sqlite))) ("sqlite" ,sqlite)))
(arguments (arguments
`(#:python ,python-2 `(#:python ,python-2

5
gnu/packages/electronics.scm
View File

@ -242,9 +242,10 @@ format support.")
`(("boost" ,boost) `(("boost" ,boost)
("glib" ,glib) ("glib" ,glib)
("glibmm" ,glibmm) ("glibmm" ,glibmm)
("qt" ,qt)
("libsigrok" ,libsigrok) ("libsigrok" ,libsigrok)
("libsigrokdecode" ,libsigrokdecode))) ("libsigrokdecode" ,libsigrokdecode)
("qtbase" ,qtbase)
("qtsvg" ,qtsvg)))
(build-system cmake-build-system) (build-system cmake-build-system)
(home-page "http://www.sigrok.org/wiki/PulseView") (home-page "http://www.sigrok.org/wiki/PulseView")
(synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok") (synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok")

617
gnu/packages/emacs.scm
View File

@ -12,7 +12,7 @@
;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com> ;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016, 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016, 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2016 Alex Vong <alexvong1995@gmail.com>
@ -22,12 +22,13 @@
;;; 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> ;;; Copyright © 2017 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2017 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 George Clemmer <myglc2@gmail.com> ;;; Copyright © 2017 George Clemmer <myglc2@gmail.com>
;;; Copyright © 2017 Feng Shu <tumashu@163.com> ;;; Copyright © 2017 Feng Shu <tumashu@163.com>
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com> ;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -58,6 +59,7 @@
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages audio) #:use-module (gnu packages audio)
#:use-module (gnu packages bash)
#:use-module (gnu packages code) #:use-module (gnu packages code)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
@ -101,14 +103,14 @@
(define-public emacs (define-public emacs
(package (package
(name "emacs") (name "emacs")
(version "25.2") (version "25.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/emacs/emacs-" (uri (string-append "mirror://gnu/emacs/emacs-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1ykkq0xl28ljdg61bm6gzy04ww86ajms98gix72qg6cpr6a53dar")) "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5"))
(patches (search-patches "emacs-exec-path.patch" (patches (search-patches "emacs-exec-path.patch"
"emacs-fix-scheme-indent-function.patch" "emacs-fix-scheme-indent-function.patch"
"emacs-source-date-epoch.patch")) "emacs-source-date-epoch.patch"))
@ -839,6 +841,7 @@ provides an optional IDE-like error list.")
(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"))
(flac (assoc-ref inputs "flac"))
(vorbis (assoc-ref inputs "vorbis-tools")) (vorbis (assoc-ref inputs "vorbis-tools"))
(alsa (assoc-ref inputs "alsa-utils")) (alsa (assoc-ref inputs "alsa-utils"))
(mpg321 (assoc-ref inputs "mpg321")) (mpg321 (assoc-ref inputs "mpg321"))
@ -861,6 +864,9 @@ provides an optional IDE-like error list.")
(substitute* "emms-player-simple.el" (substitute* "emms-player-simple.el"
(("\"ogg123\"") (("\"ogg123\"")
(string-append "\"" vorbis "/bin/ogg123\""))) (string-append "\"" vorbis "/bin/ogg123\"")))
(substitute* "emms-player-simple.el"
(("\"mpg321\"")
(string-append "\"" mpg321 "/bin/mpg321\"")))
(emacs-substitute-variables "emms-info-ogginfo.el" (emacs-substitute-variables "emms-info-ogginfo.el"
("emms-info-ogginfo-program-name" ("emms-info-ogginfo-program-name"
(string-append vorbis "/bin/ogginfo"))) (string-append vorbis "/bin/ogginfo")))
@ -870,6 +876,11 @@ provides an optional IDE-like error list.")
(emacs-substitute-variables "emms-info-mp3info.el" (emacs-substitute-variables "emms-info-mp3info.el"
("emms-info-mp3info-program-name" ("emms-info-mp3info-program-name"
(string-append mp3info "/bin/mp3info"))) (string-append mp3info "/bin/mp3info")))
(emacs-substitute-variables "emms-info-metaflac.el"
("emms-info-metaflac-program-name"
(string-append flac "/bin/metaflac")))
(emacs-substitute-variables "emms-source-file.el"
("emms-source-file-gnu-find" (which "find")))
(substitute* "emms-volume-amixer.el" (substitute* "emms-volume-amixer.el"
(("\"amixer\"") (("\"amixer\"")
(string-append "\"" alsa "/bin/amixer\""))) (string-append "\"" alsa "/bin/amixer\"")))
@ -895,6 +906,7 @@ provides an optional IDE-like error list.")
(native-inputs `(("emacs" ,emacs-minimal) ;for (guix build emacs-utils) (native-inputs `(("emacs" ,emacs-minimal) ;for (guix build emacs-utils)
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))
(inputs `(("alsa-utils" ,alsa-utils) (inputs `(("alsa-utils" ,alsa-utils)
("flac" ,flac) ;for metaflac
("vorbis-tools" ,vorbis-tools) ("vorbis-tools" ,vorbis-tools)
("mpg321" ,mpg321) ("mpg321" ,mpg321)
("taglib" ,taglib) ("taglib" ,taglib)
@ -1192,6 +1204,26 @@ Using emacs-direnv means that programs started from Emacs will use the
environment set through Direnv.") environment set through Direnv.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-go-mode
(package
(name "emacs-go-mode")
(version "1.5.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/dominikh/go-mode.el/"
"archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1adngbjyb8qnwg7n6r2y31djw9j6qf3b9fi63zd85035q7x4ljnm"))))
(build-system emacs-build-system)
(home-page "https://github.com/dominikh/go-mode.el")
(synopsis "Go mode for Emacs")
(description
"This package provides go-mode, an Emacs mode for working with software
written in the Go programming language.")
(license license:bsd-3)))
(define-public emacs-google-maps (define-public emacs-google-maps
(package (package
(name "emacs-google-maps") (name "emacs-google-maps")
@ -1244,10 +1276,32 @@ Maps directly inside Emacs.")
single buffer.") single buffer.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-tablist
(package
(name "emacs-tablist")
(version "0.70")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/politza/tablist/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"177d6s7ym1mwz1nhnl09r14z3n093g9a2szm97xsaig0c204xz9c"))))
(build-system emacs-build-system)
(home-page "https://github.com/politza/tablist")
(synopsis "Extension for @code{tabulated-list-mode}")
(description "Tablist is the Emacs package that provides several
additional features to @code{tabulated-list-mode}: it adds marks,
filters, new key bindings and faces. It can be enabled by
@code{tablist-mode} or @code{tablist-minor-mode} commands.")
(license license:gpl3+)))
(define-public emacs-pdf-tools (define-public emacs-pdf-tools
(package (package
(name "emacs-pdf-tools") (name "emacs-pdf-tools")
(version "0.70") (version "0.80")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1256,7 +1310,7 @@ single buffer.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1m0api6wiawswyk46bdsyk6r5rg3b86a4paar6nassm6x6c6vr77")))) "06imydn3a92vr57azpn1zhqc14kxyyslmyi9ldsyphan9b724gb6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; there are no tests `(#:tests? #f ; there are no tests
@ -1272,7 +1326,7 @@ single buffer.")
;; Build server side using 'gnu-build-system'. ;; Build server side using 'gnu-build-system'.
(add-after 'unpack 'enter-server-dir (add-after 'unpack 'enter-server-dir
(lambda _ (chdir "server") #t)) (lambda _ (chdir "server") #t))
(add-before 'configure 'autogen (add-after 'enter-server-dir 'autogen
(lambda _ (lambda _
(zero? (system* "bash" "autogen.sh")))) (zero? (system* "bash" "autogen.sh"))))
@ -1305,6 +1359,7 @@ single buffer.")
("glib" ,glib) ("glib" ,glib)
("libpng" ,libpng) ("libpng" ,libpng)
("zlib" ,zlib))) ("zlib" ,zlib)))
(propagated-inputs `(("tablist" ,emacs-tablist)))
(synopsis "Emacs support library for PDF files") (synopsis "Emacs support library for PDF files")
(description (description
"PDF Tools is, among other things, a replacement of DocView for PDF "PDF Tools is, among other things, a replacement of DocView for PDF
@ -1366,7 +1421,7 @@ type, for example: packages, buffers, files, etc.")
(define-public emacs-guix (define-public emacs-guix
(package (package
(name "emacs-guix") (name "emacs-guix")
(version "0.3.2") (version "0.3.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/alezost/guix.el" (uri (string-append "https://github.com/alezost/guix.el"
@ -1374,7 +1429,7 @@ type, for example: packages, buffers, files, etc.")
"/emacs-guix-" version ".tar.gz")) "/emacs-guix-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0bffxlaq4w9yijl9prnfm26fisr2rd1whjg1yzvri1zl6zh9s0lk")))) "0mjb2yb454389ds2kr5rkjkl21r78z4c0f88ivf4g471yzg279mc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -1470,6 +1525,25 @@ work with Emacs 24 and 25.")
a command.") a command.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-olivetti
(package
(name "emacs-olivetti")
(version "1.5.7")
(source (origin
(method url-fetch)
(uri (string-append
"https://stable.melpa.org/packages/olivetti-"
version ".el"))
(sha256
(base32
"1yj2ylg46q0pw1xzlv2b0fv9x8p56x25284s9v2smwjr4vf0nwcj"))))
(build-system emacs-build-system)
(home-page "https://github.com/rnkn/olivetti")
(synopsis "Emacs minor mode for a nice writing environment")
(description "This package provides an Emacs minor mode that puts writing
in the center.")
(license license:gpl3+)))
(define-public emacs-undo-tree (define-public emacs-undo-tree
(package (package
(name "emacs-undo-tree") (name "emacs-undo-tree")
@ -1628,6 +1702,36 @@ display and behaviour is easily customisable.")
of files under Git version control from within Emacs.") of files under Git version control from within Emacs.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-minitest
(package
(name "emacs-minitest")
(version "0.8.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/arthurnn/minitest-emacs/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1dsb7kzvs1x6g4sgqmq73jqacb7wzm0wfkiq5m9dqdzq8mppgiqs"))))
(build-system emacs-build-system)
(arguments
'(#:include (cons "^snippets\\/minitest-mode\\/" %default-include)
#:exclude (delete "^[^/]*tests?\\.el$" %default-exclude)))
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-f" ,emacs-f)))
(home-page "https://github.com/arthurnn/minitest-emacs")
(synopsis "Emacs minitest mode")
(description
"The minitest mode provides commands to run the tests for the current
file or line, as well as rerunning the previous tests, or all the tests for a
project.
This package also includes relevant snippets for yasnippet.")
(license license:expat)))
(define-public emacs-el-mock (define-public emacs-el-mock
(package (package
(name "emacs-el-mock") (name "emacs-el-mock")
@ -1916,6 +2020,7 @@ serve files and directory listings.")
(propagated-inputs (propagated-inputs
`(("emacs-simple-httpd" ,emacs-simple-httpd) `(("emacs-simple-httpd" ,emacs-simple-httpd)
("emacs-js2-mode" ,emacs-js2-mode))) ("emacs-js2-mode" ,emacs-js2-mode)))
(arguments '(#:include '("\\.el$" "\\.js$" "\\.html$")))
(home-page "https://github.com/skeeto/skewer-mode") (home-page "https://github.com/skeeto/skewer-mode")
(synopsis "Live web development in Emacs") (synopsis "Live web development in Emacs")
(description (description
@ -1967,6 +2072,31 @@ tables.")
mode-line.") mode-line.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public emacs-rspec
(package
(name "emacs-rspec")
(version "1.11")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/pezra/rspec-mode/"
"archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1j0a7ms5516nlg60qfyn730pfxys6acm0rgyxh5xfkpi6jafgpvw"))))
(build-system emacs-build-system)
(home-page "https://github.com/pezra/rspec-mode")
(synopsis "Provides a rspec mode for working with RSpec")
(description
"The Emacs RSpec mode provides keybindings for Ruby source files, e.g. to
verify the spec associated with the current buffer, or entire project, as well
as moving between the spec files, and coresponding code files.
Also included are keybindings for spec files and Dired buffers, as well as
snippets for yasnippet.")
(license license:gpl3+)))
(define-public emacs-smart-mode-line (define-public emacs-smart-mode-line
(package (package
(name "emacs-smart-mode-line") (name "emacs-smart-mode-line")
@ -1991,6 +2121,29 @@ read from small to large monitors by using colors, a prefix feature, and smart
truncation.") truncation.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public emacs-sr-speedbar
(package
(name "emacs-sr-speedbar")
(version "20140914.2339")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/emacsorphanage/sr-speedbar/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"15xwwc6kgvmk4wdhx1j8w6m6ivxvc94028ppgdpa2m51a8c9vjm9"))))
(build-system emacs-build-system)
(home-page "https://www.emacswiki.org/emacs/SrSpeedbar")
(synopsis "Same frame Emacs @code{speedbar}")
(description
"This Emacs package allows you to show @code{M-x speedbar} in the
same frame (in an extra window). You can customize the initial width of
the speedbar window.")
(license license:gpl3+)))
(define-public emacs-shell-switcher (define-public emacs-shell-switcher
(package (package
(name "emacs-shell-switcher") (name "emacs-shell-switcher")
@ -2416,6 +2569,27 @@ insertion mode. When enabled all keys are implicitly prefixed with
@samp{C-} (among other helpful shortcuts).") @samp{C-} (among other helpful shortcuts).")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-jinja2-mode
(package
(name "emacs-jinja2-mode")
(version "0.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/paradoxxxzero/jinja2-mode/"
"archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0cgxjab1kla2zc2fj7bzib6i7snp08zshandmp9kqcm85l262xpn"))))
(build-system emacs-build-system)
(home-page "https://github.com/paradoxxxzero/jinja2-mode")
(synopsis "Major mode for jinja2")
(description
"Emacs major mode for jinja2 with: syntax highlighting,
sgml/html integration, and indentation (working with sgml).")
(license license:gpl3+)))
(define-public emacs-rfcview (define-public emacs-rfcview
(package (package
(name "emacs-rfcview") (name "emacs-rfcview")
@ -2603,6 +2777,48 @@ transparent background. If you load it from a GUI, it will default to a
dark background.") dark background.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-2048-game
(package
(name "emacs-2048-game")
(version "20151026.1233")
(source
(origin
(method url-fetch)
(uri (string-append "https://melpa.org/packages/2048-game-"
version ".el"))
(sha256
(base32
"0gy2pvz79whpavp4jmz8h9krzn7brmvv3diixi1d4w51pcdvaldd"))))
(build-system emacs-build-system)
(home-page "https://bitbucket.org/zck/2048.el")
(synopsis "Implementation of the game 2048 in Emacs Lisp")
(description
"This program is an implementation of 2048 for Emacs.
The goal of this game is to create a tile with value 2048. The size of the
board and goal value can be customized.")
(license license:gpl3+)))
(define-public emacs-base16-theme
(package
(name "emacs-base16-theme")
(version "2.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://stable.melpa.org/packages/base16-theme-"
version ".tar"))
(sha256
(base32
"0z6hrwz2jlz6jbr381rcqcqvx6hss5cad352klx07rark7zccacj"))))
(build-system emacs-build-system)
(home-page "https://github.com/belak/base16-emacs")
(synopsis "Base16 color themes for Emacs")
(description
"Base16 provides carefully chosen syntax highlighting and a default set
of sixteen colors suitable for a wide range of applications. Base16 is not a
single theme but a set of guidelines with numerous implementations.")
(license license:expat)))
(define-public emacs-smartparens (define-public emacs-smartparens
(package (package
(name "emacs-smartparens") (name "emacs-smartparens")
@ -3116,22 +3332,25 @@ E-Prime forbids the use of the \"to be\" form to strengthen your writing.")
"0w7mbbajn377gdmvnd21mpyr368b2ia46gq6cb99y4y5rspf9pcg")))) "0w7mbbajn377gdmvnd21mpyr368b2ia46gq6cb99y4y5rspf9pcg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; There is no test suite. (let ((base-directory "/share/emacs/site-lisp/guix.d/ess"))
#:make-flags (list (string-append "PREFIX=" %output) `(#:tests? #f ; There is no test suite.
(string-append "LISPDIR=" %output #:make-flags (list (string-append "PREFIX=" %output)
"/share/emacs/site-lisp/guix.d/ess")) (string-append "ETCDIR=" %output "/"
#:phases ,base-directory "/etc")
(modify-phases %standard-phases (string-append "LISPDIR=" %output "/"
(delete 'configure) ,base-directory))
(add-before 'build 'more-shebang-patching #:phases
(lambda* (#:key inputs #:allow-other-keys) (modify-phases %standard-phases
(substitute* "Makeconf" (delete 'configure)
(("SHELL = /bin/sh") (add-before 'build 'more-shebang-patching
(string-append "SHELL = " (which "sh")))))) (lambda* (#:key inputs #:allow-other-keys)
;; FIXME: the texlive-union insists on regenerating fonts. It stores (substitute* "Makeconf"
;; them in HOME, so it needs to be writeable. (("SHELL = /bin/sh")
(add-before 'build 'set-HOME (string-append "SHELL = " (which "sh"))))))
(lambda _ (setenv "HOME" "/tmp") #t))))) ;; FIXME: the texlive-union insists on regenerating fonts. It stores
;; them in HOME, so it needs to be writeable.
(add-before 'build 'set-HOME
(lambda _ (setenv "HOME" "/tmp") #t))))))
(inputs (inputs
`(("emacs" ,emacs-minimal) `(("emacs" ,emacs-minimal)
("r-minimal" ,r-minimal))) ("r-minimal" ,r-minimal)))
@ -3196,7 +3415,7 @@ strings, and code folding.")
(define-public emacs-markdown-mode (define-public emacs-markdown-mode
(package (package
(name "emacs-markdown-mode") (name "emacs-markdown-mode")
(version "2.2") (version "2.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://raw.githubusercontent.com/jrblevin" (uri (string-append "https://raw.githubusercontent.com/jrblevin"
@ -3205,7 +3424,7 @@ strings, and code folding.")
(file-name (string-append "markdown-mode-" version ".el")) (file-name (string-append "markdown-mode-" version ".el"))
(sha256 (sha256
(base32 (base32
"04isd2sdnms9acpmkd6n7b7y7j0x2kank2kry0zwbxs3bwdavgav")))) "152whyrq3dqlqy5wv4mdd94kmal19hs5kwaxjcp2gp2r97lsmdmi"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "http://jblevins.org/projects/markdown-mode/") (home-page "http://jblevins.org/projects/markdown-mode/")
(synopsis "Emacs Major mode for Markdown files") (synopsis "Emacs Major mode for Markdown files")
@ -3334,7 +3553,7 @@ names, e.g. #0000ff is displayed in white with a blue background.")
(define-public emacs-visual-fill-column (define-public emacs-visual-fill-column
(package (package
(name "emacs-visual-fill-column") (name "emacs-visual-fill-column")
(version "1.7") (version "1.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://codeload.github.com/joostkremers/" (uri (string-append "https://codeload.github.com/joostkremers/"
@ -3342,7 +3561,7 @@ names, e.g. #0000ff is displayed in white with a blue background.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"12vn7kdq2mpz9hgibbn1vhpf23lcm7c26k3fkz8nidhygwl5x5lq")))) "13jnviakp607zcms7f8ams56mr8wffnq1pghlc6fvqs39663pgwh"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/joostkremers/visual-fill-column") (home-page "https://github.com/joostkremers/visual-fill-column")
(synopsis "Fill-column for visual-line-mode") (synopsis "Fill-column for visual-line-mode")
@ -3355,6 +3574,31 @@ wrapping lines at the window edge, which is the standard behaviour of
window edge.") window edge.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-writeroom
(package
(name "emacs-writeroom")
(version "3.7")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/joostkremers/writeroom-mode/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0yqgp5h3kvvpgva4azakb2wnjl7gsyh45glf75crspv3xyq57f2r"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-visual-fill-column" ,emacs-visual-fill-column)))
(home-page "https://github.com/joostkremers/writeroom-mode")
(synopsis "Distraction-free writing for Emacs")
(description
"This package defines a minor mode for distraction-free writing. Some of
the default effects include entering fullscreen, deleting other windows of the
current frame, disabling the mode line, and adding margins to the buffer that
restrict the text width to 80 characters.")
(license license:bsd-3)))
(define-public emacs-ido-completing-read+ (define-public emacs-ido-completing-read+
(package (package
(name "emacs-ido-completing-read+") (name "emacs-ido-completing-read+")
@ -3447,6 +3691,27 @@ Dust.js, React/JSX, Angularjs, ejs, etc.")
(home-page "http://web-mode.org/") (home-page "http://web-mode.org/")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-wgrep
(package
(name "emacs-wgrep")
(version "2.1.10")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/mhayashi1120/Emacs-wgrep/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1r2bpypar70xg6dsx12x1k74f39ww930rday7rgqpyknzsx1k4l1"))))
(build-system emacs-build-system)
(home-page "https://github.com/mhayashi1120/Emacs-wgrep")
(synopsis "Edit a grep buffer and apply those changes to the files")
(description
"Emacs wgrep allows you to edit a grep buffer and apply those changes to
the file buffer.")
(license license:gpl3+)))
(define-public emacs-helm (define-public emacs-helm
(package (package
(name "emacs-helm") (name "emacs-helm")
@ -3528,7 +3793,7 @@ for search-based navigation of buffers.")
(define-public emacs-cider (define-public emacs-cider
(package (package
(name "emacs-cider") (name "emacs-cider")
(version "0.12.0") (version "0.15.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -3537,8 +3802,11 @@ for search-based navigation of buffers.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"00qzbfjy3w6bcnki7gw0clmi0cc5yqjdrcyhgv4ymijjs79h9p5s")))) "0j7qjcslh8mnxrr2m8qrscyq9ry240j5jd9dysbvih126lxisf12"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments
'(#:exclude ; Don't exclude 'cider-test.el'.
'("^\\.dir-locals\\.el$" "^test/")))
(propagated-inputs (propagated-inputs
`(("emacs-clojure-mode" ,emacs-clojure-mode) `(("emacs-clojure-mode" ,emacs-clojure-mode)
("emacs-spinner" ,emacs-spinner) ("emacs-spinner" ,emacs-spinner)
@ -3561,30 +3829,32 @@ CIDER).")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-lua-mode (define-public emacs-lua-mode
(package (let ((commit "652e299cb967fccca827dda381d61a9c144d97de")
(name "emacs-lua-mode") (revision "1"))
(version "20151025") (package
(source (origin (name "emacs-lua-mode")
(method url-fetch) (version (string-append "20151025." revision "-" (string-take commit 9)))
(uri (string-append (home-page "https://github.com/immerrr/lua-mode/")
"https://github.com/immerrr/lua-mode/archive/v" (source (origin
version ".tar.gz")) (method git-fetch)
(file-name (string-append name "-" version ".tar.gz")) (uri (git-reference
(sha256 (url home-page)
(base32 (commit commit)))
"0sbhfny5ib65cnx6xcy6h9bbw27mw034s8m9cca00bhxqaqi6p4v")))) (file-name (string-append name "-" version ".checkout"))
(build-system emacs-build-system) (sha256
(home-page "https://github.com/immerrr/lua-mode/") (base32
(synopsis "Major mode for lua") "053025k930wh0lak6rc1973ynfrmm8zsyzfqhhd39x7abkl41hc9"))))
(description (build-system emacs-build-system)
"This Emacs package provides a mode for @uref{https://www.lua.org/, (synopsis "Major mode for lua")
(description
"This Emacs package provides a mode for @uref{https://www.lua.org/,
Lua programing language}.") Lua programing language}.")
(license license:gpl2+))) (license license:gpl2+))))
(define-public emacs-ebuild-mode (define-public emacs-ebuild-mode
(package (package
(name "emacs-ebuild-mode") (name "emacs-ebuild-mode")
(version "1.30") (version "1.37")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -3593,7 +3863,7 @@ Lua programing language}.")
(file-name (string-append name "-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0vp7lq1kvmh1b2bms2x1kf2k76dy9m02d7cirkxpiglwaxa0h9vz")))) "07dzrdjjczkxdfdgi60h4jjkvzi4p0k9rij2wpfp8s03ay3qldpp"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://devmanual.gentoo.org") (home-page "https://devmanual.gentoo.org")
(synopsis "Major modes for Gentoo package files") (synopsis "Major modes for Gentoo package files")
@ -3716,14 +3986,14 @@ passive voice.")
(define-public emacs-org (define-public emacs-org
(package (package
(name "emacs-org") (name "emacs-org")
(version "20170622") (version "20170917")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://elpa.gnu.org/packages/org-" (uri (string-append "http://elpa.gnu.org/packages/org-"
version ".tar")) version ".tar"))
(sha256 (sha256
(base32 (base32
"0922lcbr2r7bkswljqzbm5y3ny1n67qfrmf7h7z9hsw2wy0505dp")))) "0qyis5ph3h99zn9kx7sgraddz41c1cf6yjkwi4im6ikwxk9x8cgc"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "http://orgmode.org/") (home-page "http://orgmode.org/")
(synopsis "Outline-based notes management and organizer") (synopsis "Outline-based notes management and organizer")
@ -3760,7 +4030,7 @@ Flx has support for ido (interactively do things) through flx-ido.")
(define-public emacs-cyberpunk-theme (define-public emacs-cyberpunk-theme
(package (package
(name "emacs-cyberpunk-theme") (name "emacs-cyberpunk-theme")
(version "1.18") (version "1.19")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -3768,7 +4038,7 @@ Flx has support for ido (interactively do things) through flx-ido.")
"archive/" version ".tar.gz")) "archive/" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0pxzbw0qjxgkhhs3gn3k9qy41kl1a4pfzbw83dk24l4b3nxd24wg")) "05l5fxw1mn5py6mfhxrzyqjq0d8m5m1akfi46vrgh13r414jffvv"))
(file-name (string-append name "-" version ".tar.gz")))) (file-name (string-append name "-" version ".tar.gz"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/n3mo/cyberpunk-theme.el") (home-page "https://github.com/n3mo/cyberpunk-theme.el")
@ -4621,6 +4891,97 @@ the same - CDLaTeX focuses on speediness for inserting LaTeX
constructs.") constructs.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-cnfonts
(package
(name "emacs-cnfonts")
(version "0.9.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/tumashu/cnfonts/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1l6cgcvc6md1zq97ccczankpyi0k4vjx6apflny6kjq3p33lyhf4"))))
(build-system emacs-build-system)
(home-page "https://github.com/tumashu/cnfonts")
(synopsis "Emacs Chinese fonts setup tool")
(description "cnfonts is a Chinese fonts setup tool, allowing for easy
configuration of Chinese fonts.")
(license license:gpl2+)))
(define-public emacs-pos-tip
(package
(name "emacs-pos-tip")
(version "0.4.6")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/pitkali/pos-tip/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"12jqfy26vjk7lq0aa8yn8zqj8c85fkvx7y9prj0pcn4wqiz2ad2r"))))
(build-system emacs-build-system)
;; The following functions and variables needed by emacs-pos-tip are
;; not included in emacs-minimal:
;; x-display-pixel-width, x-display-pixel-height, x-show-tip
(arguments `(#:emacs ,emacs))
(home-page "https://github.com/pitkali/pos-tip")
(synopsis "Show tooltip at point")
(description "The standard library tooltip.el provides a function for
displaying a tooltip at the mouse position. However, locating a tooltip at an
arbitrary buffer position in a window is not easy. Pos-tip provides such a
function to be used by other frontend programs.")
(license license:gpl2+)))
(define-public emacs-pyim-basedict
(package
(name "emacs-pyim-basedict")
(version "0.3.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/tumashu/pyim-basedict/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0nfgxviavkgrpyfsw60xsws4fk51fcmgl8fp6zf4ibqjjbp53n3n"))))
(build-system emacs-build-system)
(home-page "https://github.com/tumashu/pyim-basedict")
(synopsis "Input method dictionary of pyim")
(description "Pyim-basedict is the default pinyin input method dictionary,
containing words from the rime project.")
(license license:gpl2+)))
(define-public emacs-pyim
(package
(name "emacs-pyim")
(version "1.6.4")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/tumashu/pyim/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0hfg8q9hcjifvnlghw2g94dfxfirms2psq2ghqb28fhkf0lks13r"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-async" ,emacs-async)
("emacs-exwm" ,emacs-pyim-basedict)
("emacs-popup" ,emacs-popup)
("emacs-pos-tip" ,emacs-pos-tip)))
(home-page "https://github.com/tumashu/pyim")
(synopsis "Chinese input method")
(description "Chinese input method which supports quanpin, shuangpin, wubi
and cangjie.")
(license license:gpl2+)))
(define-public emacs-xelb (define-public emacs-xelb
(package (package
(name "emacs-xelb") (name "emacs-xelb")
@ -5363,3 +5724,149 @@ enables you to easily define search engines, bind them to keybindings, and
query them from the comfort of your editor.") query them from the comfort of your editor.")
(home-page "https://github.com/hrs/engine-mode") (home-page "https://github.com/hrs/engine-mode")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-prop-menu
(package
(name "emacs-prop-menu")
(version "0.1.2")
(source
(origin
(method url-fetch)
(uri (string-append
"http://stable.melpa.org/packages/prop-menu-"
version ".el"))
(sha256
(base32
"01bk4sjafzz7gqrkv9jg0pa85qr34vbk3q8ga2b0m61bndywzgpr"))))
(build-system emacs-build-system)
(home-page
"https://github.com/david-christiansen/prop-menu-el")
(synopsis
"Create and display a context menu based on text and overlay properties")
(description
"This is a library for computing context menus based on text
properties and overlays. The intended use is to have tools that
annotate source code and others that use these annotations, without
requiring a direct coupling between them, but maintaining
discoverability.
Major modes that wish to use this library should first define an
appropriate value for @code{prop-menu-item-functions}. Then, they should
bind @code{prop-menu-by-completing-read} to an appropriate
key. Optionally, a mouse pop-up can be added by binding
@code{prop-menu-show-menu} to a mouse event.")
(license license:gpl3+)))
(define-public emacs-idris-mode
(package
(name "emacs-idris-mode")
(version "0.9.19")
(source
(origin
(method url-fetch)
(uri (string-append
"http://stable.melpa.org/packages/idris-mode-"
version ".tar"))
(sha256
(base32
"0ld4kfwnyyhlsnj5f6cbn4is4mpxdqalk2aifkw02r00mbr9n294"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-prop-menu" ,emacs-prop-menu)))
(home-page
"https://github.com/idris-hackers/idris-mode")
(synopsis "Major mode for editing Idris code")
(description
"This is an Emacs mode for editing Idris code. It requires the latest
version of Idris, and some features may rely on the latest Git version of
Idris.")
(license license:gpl3+)))
(define-public emacs-browse-at-remote
(let ((commit "b5cff7971ca8bbb966e3acd9b7e5c4c007f94215")
(revision "1"))
(package
(name "emacs-browse-at-remote")
(version (string-append "0.9.0-" revision "."
(string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rmuslimov/browse-at-remote.git")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"16ms9703m15dfxg6ap4mdw7msf8z5rzsdhba51dwivfpjxg7n52c"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-f" ,emacs-f)
("emacs-s" ,emacs-s)))
(native-inputs
`(("ert-runner" ,ert-runner)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'install 'check
(lambda _
(zero? (system* "ert-runner")))))))
(home-page "https://github.com/rmuslimov/browse-at-remote")
(synopsis "Open github/gitlab/bitbucket/stash page from Emacs")
(description
"This Emacs package allows you to open a target page on
github/gitlab (or bitbucket) by calling @code{browse-at-remote} command.
It supports dired buffers and opens them in tree mode at destination.")
(license license:gpl3+))))
(define-public emacs-tiny
(package
(name "emacs-tiny")
(version "0.1.1")
(source
(origin
(method url-fetch)
(uri (string-append "http://elpa.gnu.org/packages/tiny-" version ".tar"))
(sha256
(base32
"1nhg8375qdn457wj0xmfaj72s87xbabk2w1nl6q7rjvwxv08yyn7"))))
(build-system emacs-build-system)
(home-page "https://github.com/abo-abo/tiny")
(synopsis "Quickly generate linear ranges in Emacs")
(description
"The main command of the @code{tiny} extension for Emacs is @code{tiny-expand}.
It is meant to quickly generate linear ranges, e.g. 5, 6, 7, 8. Some elisp
proficiency is an advantage, since you can transform your numeric range with
an elisp expression.")
(license license:gpl3+)))
(define-public emacs-bash-completion
(package
(name "emacs-bash-completion")
(version "2.0.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/szermatt/emacs-bash-completion/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0mkci4a1fy8z4cmry8mx5vsx4f16a8r454slnh7lqzidnhfi63hj"))))
(inputs `(("bash" ,bash)))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'install 'configure
(lambda* (#:key inputs #:allow-other-keys)
(let ((bash (assoc-ref inputs "bash")))
(emacs-substitute-variables "bash-completion.el"
("bash-completion-prog" (string-append bash "/bin/bash"))))
#t)))))
(home-page "https://github.com/szermatt/emacs-bash-completion")
(synopsis "BASH completion for the shell buffer")
(description
"@code{bash-completion} defines dynamic completion hooks for shell-mode
and shell-command prompts that are based on bash completion.")
(license license:gpl2+)))

121
gnu/packages/embedded.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Theodoros Foradis <theodoros.for@openmailbox.org> ;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -290,8 +290,8 @@ languages are C and C++.")
(define-public libjaylink (define-public libjaylink
;; No release tarballs available. ;; No release tarballs available.
(let ((commit "faa2a433fdd3de211728f3da5921133214af9dd3") (let ((commit "699b7001d34a79c8e7064503dde1bede786fd7f0")
(revision "1")) (revision "2"))
(package (package
(name "libjaylink") (name "libjaylink")
(version (string-append "0.1.0-" revision "." (version (string-append "0.1.0-" revision "."
@ -304,7 +304,7 @@ languages are C and C++.")
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"02crr56csz8whq3q4mrmdzzgwp5b0qvxm0fb18drclc3zj44yxl2")))) "034872d44myycnzn67v5b8ixrgmg8sk32aqalvm5x7108w2byww1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
@ -316,7 +316,7 @@ languages are C and C++.")
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'autoreconf (add-after 'unpack 'autoreconf
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vfi"))))))) (zero? (system* "autoreconf" "-vfi")))))))
(home-page "http://repo.or.cz/w/libjaylink.git") (home-page "http://repo.or.cz/w/libjaylink.git")
@ -355,59 +355,66 @@ language.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public openocd (define-public openocd
;; FIXME: Use tarball release after nrf52 patch is merged. (package
(let ((commit "674141e8a7a6413cb803d90c2a20150260015f81") (name "openocd")
(revision "1")) (version "0.10.0")
(package (source (origin
(name "openocd") (method url-fetch)
(version (string-append "0.9.0-" revision "." (uri (string-append "mirror://sourceforge/openocd/openocd/"
(string-take commit 7))) version "/openocd-" version ".tar.gz"))
(source (origin (sha256
(method git-fetch) (base32
(uri (git-reference "09p57y3c2spqx4vjjlz1ljm1lcd0j9q8g76ywxqgn3yc34wv18zd"))
(url "https://git.code.sf.net/p/openocd/code.git") ;; FIXME: Remove after nrf52 patch is merged.
(commit commit))) (patches
(sha256 (search-patches "openocd-nrf52.patch"))))
(base32 (build-system gnu-build-system)
"1i86jp0wawq78d73z8hp7q1pn7lmlvhjjr19f7299h4w40a5jf8j")) (native-inputs
(file-name (string-append name "-" version "-checkout")) `(("autoconf" ,autoconf)
(patches ("automake" ,automake)
(search-patches "openocd-nrf52.patch")))) ("libtool" ,libtool)
(build-system gnu-build-system) ("pkg-config" ,pkg-config)))
(native-inputs (inputs
`(("autoconf" ,autoconf) `(("hidapi" ,hidapi)
("automake" ,automake) ("jimtcl" ,jimtcl)
("libtool" ,libtool) ("libftdi" ,libftdi)
("pkg-config" ,pkg-config))) ("libjaylink" ,libjaylink)
(inputs ("libusb-compat" ,libusb-compat)))
`(("hidapi" ,hidapi) (arguments
("jimtcl" ,jimtcl) '(#:configure-flags
("libftdi" ,libftdi) (append (list "--disable-werror"
("libjaylink" ,libjaylink) "--enable-sysfsgpio"
("libusb-compat" ,libusb-compat))) "--disable-internal-jimtcl"
(arguments "--disable-internal-libjaylink")
'(#:configure-flags (map (lambda (programmer)
(append (list "--disable-werror" (string-append "--enable-" programmer))
"--disable-internal-jimtcl" '("amtjtagaccel" "armjtagew" "buspirate" "ftdi"
"--disable-internal-libjaylink") "gw16012" "jlink" "opendous" "osbdm"
(map (lambda (programmer) "parport" "aice" "cmsis-dap" "dummy" "jtag_vpi"
(string-append "--enable-" programmer)) "remote-bitbang" "rlink" "stlink" "ti-icdi" "ulink"
'("amtjtagaccel" "armjtagew" "buspirate" "ftdi" "usbprog" "vsllink" "usb-blaster-2" "usb_blaster"
"gw16012" "jlink" "oocd_trace" "opendous" "osbdm" "presto" "openjtag")))
"parport" "aice" "cmsis-dap" "dummy" "jtag_vpi" #:phases
"remote-bitbang" "rlink" "stlink" "ti-icdi" "ulink" (modify-phases %standard-phases
"usbprog" "vsllink" "usb-blaster-2" "usb_blaster" (add-before 'configure 'autoreconf
"presto" "openjtag"))) (lambda _
#:phases (zero? (system* "autoreconf" "-vfi"))))
(modify-phases %standard-phases (add-after 'autoreconf 'change-udev-group
(add-before 'configure 'autoreconf (lambda _
(lambda _ (substitute* "contrib/60-openocd.rules"
(zero? (system* "autoreconf" "-vfi"))))))) (("plugdev") "dialout"))
(home-page "http://openocd.org") #t))
(synopsis "On-Chip Debugger") (add-after 'install 'install-udev-rules
(description "OpenOCD provides on-chip programming and debugging support (lambda* (#:key outputs #:allow-other-keys)
(install-file "contrib/60-openocd.rules"
(string-append
(assoc-ref outputs "out")
"/lib/udev/rules.d/")))))))
(home-page "http://openocd.org")
(synopsis "On-Chip Debugger")
(description "OpenOCD provides on-chip programming and debugging support
with a layered architecture of JTAG interface and TAP support.") with a layered architecture of JTAG interface and TAP support.")
(license license:gpl2+)))) (license license:gpl2+)))
;; The commits for all propeller tools are the latest versions as published ;; The commits for all propeller tools are the latest versions as published
;; here: https://github.com/dbetz/propeller-gcc ;; here: https://github.com/dbetz/propeller-gcc

70
gnu/packages/engineering.scm
View File

@ -61,6 +61,7 @@
#:use-module (gnu packages m4) #:use-module (gnu packages m4)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages mpi)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -485,16 +486,16 @@ ready for production.")
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'autoconf (add-after 'unpack 'autoconf
(lambda _ (lambda _
;; Build rules contain references to Russian translation, but the ;; Build rules contain references to Russian translation, but the
;; needed files are missing; see ;; needed files are missing; see
;; http://sourceforge.net/p/gerbv/bugs/174/ ;; http://sourceforge.net/p/gerbv/bugs/174/
(delete-file "po/LINGUAS") (delete-file "po/LINGUAS")
(substitute* "man/Makefile.am" (substitute* "man/Makefile.am"
(("PO_FILES= gerbv.ru.1.in.po") "") (("PO_FILES= gerbv.ru.1.in.po") "")
(("man_MANS = gerbv.1 gerbv.ru.1") "man_MANS = gerbv.1")) (("man_MANS = gerbv.1 gerbv.ru.1") "man_MANS = gerbv.1"))
(zero? (system* "autoreconf" "-vfi"))))))) (zero? (system* "autoreconf" "-vfi")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -1128,3 +1129,52 @@ hexadecimal editor able to open disk files, but later support for analyzing
binaries, disassembling code, debugging programs, attaching to remote gdb binaries, disassembling code, debugging programs, attaching to remote gdb
servers, ...") servers, ...")
(license license:lgpl3))) (license license:lgpl3)))
(define-public asco
(package
(name "asco")
(version "0.4.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/asco/asco/" version "/ASCO-"
version ".tar.gz"))
(sha256
(base32
"119rbc2dc8xzwxvykgji0v0nrzvymjmlizr1bc2mihspj686kxsl"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
#:make-flags '("all" "asco-mpi")
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((coreutils (assoc-ref inputs "coreutils-minimal")))
(substitute* '("errfunc.c" "asco.c")
(("cp ")
(string-append coreutils "/bin/cp "))
(("nice")
(string-append coreutils "/bin/nice")))
(substitute* "Makefile"
(("<FULL_PATH_TO_MPICH>/bin/mpicc") (which "mpicc")))
#t)))
(replace 'install ; no install target
(lambda* (#:key outputs #:allow-other-keys)
(for-each (lambda (file)
(install-file file (string-append
(assoc-ref outputs "out")
"/bin")))
'("asco" "asco-mpi" "asco-test"
"tools/alter/alter" "tools/log/log"))
#t)))))
(native-inputs
`(("mpi" ,openmpi)))
(inputs
`(("coreutils-minimal" ,coreutils-minimal)))
(home-page "http://asco.sourceforge.net/")
(synopsis "SPICE circuit optimizer")
(description
"ASCO brings circuit optimization capabilities to existing SPICE simulators using a
high-performance parallel differential evolution (DE) optimization algorithm.")
(license license:gpl2+)))

18
gnu/packages/enlightenment.scm
View File

@ -59,7 +59,7 @@
(define-public efl (define-public efl
(package (package
(name "efl") (name "efl")
(version "1.20.2") (version "1.20.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -67,7 +67,7 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0zll6k4xbbdsxqg53g8jddgv889g5m1xh20i03iz5a52y2bcnh55")))) "1jxha61gsil6hs9zb72zsyh3gmdipvfnlc9v3palb2bm0b23aq9i"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -149,6 +149,16 @@
"--enable-drm") "--enable-drm")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; If we don't hardcode the location of libcurl.so then we
;; have to wrap the outputs of efl's dependencies in curl.
(add-after 'unpack 'hardcode-libcurl-location
(lambda* (#:key inputs #:allow-other-keys)
(let* ((curl (assoc-ref inputs "curl"))
(lib (string-append curl "/lib/")))
(substitute* "src/lib/ecore_con/ecore_con_url_curl.c"
(("libcurl.so.?" libcurl) ; libcurl.so.[45]
(string-append lib libcurl)))
#t)))
(add-after 'unpack 'set-home-directory (add-after 'unpack 'set-home-directory
;; FATAL: Cannot create run dir '/homeless-shelter/.run' - errno=2 ;; FATAL: Cannot create run dir '/homeless-shelter/.run' - errno=2
(lambda _ (setenv "HOME" "/tmp") #t))))) (lambda _ (setenv "HOME" "/tmp") #t)))))
@ -165,7 +175,7 @@ removable devices or support for multimedia.")
(define-public terminology (define-public terminology
(package (package
(name "terminology") (name "terminology")
(version "1.1.0") (version "1.1.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -173,7 +183,7 @@ removable devices or support for multimedia.")
"terminology/terminology-" version ".tar.xz")) "terminology/terminology-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"13rl1k22yf8qrpzdm5nh6ij641fibadr2ww1r7rnz7mbhzj3d4gb")) "05ncxvzb9rzkyjvd95hzn8lswqdwr8cix6rd54nqn9559jibh4ns"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Remove the bundled fonts. ;; Remove the bundled fonts.
;; TODO: Remove bundled lz4. ;; TODO: Remove bundled lz4.

2
gnu/packages/erlang.scm
View File

@ -143,7 +143,7 @@
(add-before 'configure 'set-erl-top (add-before 'configure 'set-erl-top
(lambda _ (lambda _
(setenv "ERL_TOP" (getcwd)))) (setenv "ERL_TOP" (getcwd))))
(add-before 'configure 'autoconf (add-after 'patch-source-env 'autoconf
(lambda _ (zero? (system* "./otp_build" "autoconf")))) (lambda _ (zero? (system* "./otp_build" "autoconf"))))
(add-after 'install 'patch-erl (add-after 'install 'patch-erl
;; This only works after install. ;; This only works after install.

173
gnu/packages/fabric-management.scm Normal file
View File

@ -0,0 +1,173 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Dave Love <fx@gnu.org>
;;;
;;; 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 fabric-management)
#:use-module (guix packages)
#:use-module (guix licenses)
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages bison)
#:use-module (gnu packages flex)
#:use-module (gnu packages glib)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages linux)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages swig)
#:use-module (gnu packages tcl))
;; Fixme: Done for the library, but needs support for running the daemon
;; (shepherd definition).
;; We should probably have a lib output, but that currently generates
;; a cycle.
(define-public opensm
(package
(name "opensm")
(version "3.3.20")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.openfabrics.org/downloads/management/opensm-"
version ".tar.gz"))
(sha256 (base32 "162sg1w7kgy8ayl8a4dcbrfacmnfy2lr9a2yjyq0k65rmd378zg1"))))
(build-system gnu-build-system)
(native-inputs
`(("flex" ,flex)
("bison" ,bison)))
(inputs
`(("rdma-core" ,rdma-core)))
(arguments
`(#:configure-flags '("--disable-static")
#:phases
(modify-phases %standard-phases
(add-after 'install 'doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((base (assoc-ref outputs "out"))
(doc (string-append base "/share/doc/"
,name "-" ,version)))
(for-each (lambda (file)
(install-file file doc))
(append (list "AUTHORS" "COPYING" "ChangeLog")
(find-files "doc")))
#t))))))
(home-page "https://www.openfabrics.org/")
(synopsis "OpenIB InfiniBand Subnet Manager and management utilities")
(description "\
OpenSM is the OpenIB project's Subnet Manager for Infiniband networks.
The subnet manager is run as a system daemon on one of the machines in
the infiniband fabric to manage the fabric's routing state. This package
also contains various tools for diagnosing and testing Infiniband networks
that can be used from any machine and do not need to be run on a machine
running the opensm daemon.")
(license (list gpl2 bsd-2))))
(define-public infiniband-diags
(package
(name "infiniband-diags")
(version "2.0.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/linux-rdma/infiniband-diags/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1ns9sjwvxnklhi47d6k5x8kxdk1n7f5362y45xwxqmr7gwfvpmwa"))))
(build-system gnu-build-system)
(inputs
`(("rdma-core" ,rdma-core)
("opensm" ,opensm)
("glib" ,glib)))
(outputs '("out" "lib"))
(native-inputs
;; FIXME: needs rst2man for man pages
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("perl" ,perl)
("pkg-config" ,pkg-config)))
(arguments
'(#:configure-flags
(list (string-append "CPPFLAGS=-I" (assoc-ref %build-inputs "opensm")
"/include/infiniband")
(string-append "--with-perl-installdir=" (assoc-ref %outputs "lib")
"/lib/perl5/vendor_perl")
"--disable-static")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'autotools
(lambda _
(zero? (system "./autogen.sh"))))
(add-after 'install 'licence
(lambda _
(let ((doc (string-append (assoc-ref %outputs "lib") "/share/doc")))
(mkdir-p doc)
(install-file "COPYING" doc))))
(add-after 'install-file 'move-perl
;; Avoid perl in lib closure
(lambda _
(let ((perlout (string-append (assoc-ref %outputs "out") "/lib"))
(perlin (string-append (assoc-ref %outputs "lib")
"/lib/perl5")))
(mkdir-p perlout)
(rename-file perlin perlout)
#t))))))
(home-page "https://github.com/linux-rdma/infiniband-diags")
(synopsis "Infiniband diagnotic tools")
(description "This is a set of command-line utilities to help configure,
debug, and maintain Infiniband (IB) fabrics.
In addition to the utilities, a sub-library, @file{libibnetdisc}, is provided
to scan an entire IB fabric and return data structures representing it. The
interface to this library is not guaranteed to be stable.")
(license (list gpl2 bsd-2)))) ; dual
(define-public ibutils
(package
(name "ibutils")
(version "1.5.7-0.2.gbd7e502")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.openfabrics.org/downloads/ibutils/ibutils-"
version ".tar.gz"))
(sha256
(base32 "00x7v6cf8l5y6g9xwh1sg738ch42fhv19msx0h0090nhr0bv98v7"))))
(build-system gnu-build-system)
(inputs `(("graphviz" ,graphviz)
("tcl" ,tcl)
("tk" ,tk)
("infiniband-diags" ,infiniband-diags)
("rdma-core" ,rdma-core)
("opensm" ,opensm)
("perl" ,perl)))
(native-inputs `(("swig" ,swig)))
(arguments
`(#:configure-flags
(list (string-append "--with-osm=" (assoc-ref %build-inputs "opensm"))
(string-append "--with-tk-lib=" (assoc-ref %build-inputs "tk") "/lib")
"--disable-static")))
(synopsis "InfiniBand network utilities")
(description "These command-line utilities allow for diagnosing and
testing InfiniBand networks.")
(home-page "https://www.openfabrics.org/downloads/ibutils/")
(license bsd-2)))

1
gnu/packages/file.scm
View File

@ -50,4 +50,3 @@ extensions to tell you the type of a file, but looks at the actual contents
of the file.") of the file.")
(license bsd-2) (license bsd-2)
(home-page "https://www.darwinsys.com/file/"))) (home-page "https://www.darwinsys.com/file/")))

216
gnu/packages/finance.scm
View File

@ -1,9 +1,10 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -29,11 +30,16 @@
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages documentation)
#:use-module (gnu packages dns)
#:use-module (gnu packages emacs) #:use-module (gnu packages emacs)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
#:use-module (gnu packages libedit) #:use-module (gnu packages libedit)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages libunwind)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -44,12 +50,14 @@
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages upnp) #:use-module (gnu packages upnp)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (gnu packages gnuzilla)) #:use-module (gnu packages gnuzilla))
(define-public bitcoin-core (define-public bitcoin-core
(package (package
(name "bitcoin-core") (name "bitcoin-core")
(version "0.14.2") (version "0.15.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -57,12 +65,13 @@
version "/bitcoin-" version ".tar.gz")) version "/bitcoin-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1jp8vdc25gs46gj1d9mraqa1xnampffpa7mdy0fw80xca77fbi0s")))) "16si3skhm6jhw1pkniv2b9y1kkdhjmhj392palphir0qc1srwzmm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("python" ,python) ; for the tests ("python" ,python) ; for the tests
("util-linux" ,util-linux))) ; provides the hexdump command for tests ("util-linux" ,util-linux) ; provides the hexdump command for tests
("qttools" ,qttools)))
(inputs (inputs
`(("bdb" ,bdb-5.3) ; with 6.2.23, there is an error: ambiguous overload `(("bdb" ,bdb-5.3) ; with 6.2.23, there is an error: ambiguous overload
("boost" ,boost) ("boost" ,boost)
@ -70,8 +79,7 @@
("miniupnpc" ,miniupnpc) ("miniupnpc" ,miniupnpc)
("openssl" ,openssl) ("openssl" ,openssl)
("protobuf" ,protobuf) ("protobuf" ,protobuf)
;; TODO Build with the modular Qt. ("qtbase" ,qtbase)))
("qt" ,qt)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (list
@ -79,7 +87,16 @@
"--with-incompatible-bdb" "--with-incompatible-bdb"
;; Boost is not found unless specified manually. ;; Boost is not found unless specified manually.
(string-append "--with-boost=" (string-append "--with-boost="
(assoc-ref %build-inputs "boost"))) (assoc-ref %build-inputs "boost"))
;; XXX: The configure script looks up Qt paths by
;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick
;; up executables residing in 'qttools', so we specify them here.
(string-append "ac_cv_path_LRELEASE="
(assoc-ref %build-inputs "qttools")
"/bin/lrelease")
(string-append "ac_cv_path_LUPDATE="
(assoc-ref %build-inputs "qttools")
"/bin/lupdate"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'set-home (add-before 'check 'set-home
@ -246,7 +263,7 @@ do so.")
(define-public electrum (define-public electrum
(package (package
(name "electrum") (name "electrum")
(version "2.7.12") (version "2.9.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -255,7 +272,7 @@ do so.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0vxdfl208if7mdsnva1jg37bnay2dsz3ww157aqwcv1j6512fi1n")) "0d0fzb653g7b8ka3x90nl21md4g3n1fv11czdxpdq3s9yr6js6f2"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -264,7 +281,8 @@ do so.")
#t)))) #t))))
(build-system python-build-system) (build-system python-build-system)
(inputs (inputs
`(("python-slowaes" ,python2-slowaes) `(("python-pyaes" ,python2-pyaes)
("python-pysocks" ,python2-pysocks)
("python-sip" ,python2-sip) ("python-sip" ,python2-sip)
("python-pyqt" ,python2-pyqt-4) ("python-pyqt" ,python2-pyqt-4)
("python-ecdsa" ,python2-ecdsa) ("python-ecdsa" ,python2-ecdsa)
@ -291,3 +309,181 @@ protocol. It supports Simple Payment Verification (SPV) and deterministic key
generation from a seed. Your secret keys are encrypted and are never sent to generation from a seed. Your secret keys are encrypted and are never sent to
other machines/servers. Electrum does not download the Bitcoin blockchain.") other machines/servers. Electrum does not download the Bitcoin blockchain.")
(license license:expat))) (license license:expat)))
(define-public monero
;; This package bundles easylogging++ and lmdb.
;; The bundled easylogging++ is modified, and the changes will not be upstreamed.
;; The devs deem the lmdb driver too critical a consenus component, to use
;; the system's dynamically linked library.
(package
(name "monero")
(version "0.11.0.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/monero-project/monero/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete bundled dependencies.
(for-each
delete-file-recursively
'("external/miniupnpc" "external/rapidjson"
"external/unbound"))
#t))
(sha256
(base32
"083w40a553c0r3i18020jcrv5s0b64vx3d8xrn9nwkb2237ighlk"))))
(build-system cmake-build-system)
(native-inputs
`(("doxygen" ,doxygen)
("googletest" ,googletest)
("graphviz" ,graphviz)
("pkg-config" ,pkg-config)))
(inputs
`(("bind" ,isc-bind)
("boost" ,boost)
("expat" ,expat)
("libunwind" ,libunwind)
("lmdb" ,lmdb)
("miniupnpc" ,miniupnpc)
("openssl" ,openssl)
("rapidjson" ,rapidjson)
("unbound" ,unbound)))
(arguments
`(#:out-of-source? #t
#:configure-flags '("-DBUILD_TESTS=ON"
,@(if (string=? "aarch64-linux" (%current-system))
'("-DARCH=armv8-a")
'())
"-DBUILD_GUI_DEPS=ON")
#:phases
(modify-phases %standard-phases
;; tests/core_tests need a valid HOME
(add-before 'configure 'set-home
(lambda _
(setenv "HOME" (getcwd))
#t))
(add-after 'set-home 'fix-wallet-path-for-unit-tests
(lambda _
(substitute* "tests/unit_tests/serialization.cpp"
(("\\.\\./\\.\\./\\.\\./\\.\\./") "../../"))
#t))
(add-after 'fix-wallet-path-for-unit-tests 'change-log-path
(lambda _
(substitute* "contrib/epee/src/mlog.cpp"
(("epee::string_tools::get_current_module_folder\\(\\)")
"\".bitmonero\""))
(substitute* "contrib/epee/src/mlog.cpp"
(("return \\(") "return ((std::string(getenv(\"HOME\"))) / "))
#t))
(replace 'check
(lambda _
(zero?
(system* "make" "ARGS=-E 'unit_tests|libwallet_api_tests'"
"test"))))
;; The excluded unit tests need network access
(add-after 'check 'unit-tests
(lambda _
(let ((excluded-unit-tests
(string-join
'("AddressFromURL.Success"
"AddressFromURL.Failure"
"DNSResolver.IPv4Success"
"DNSResolver.DNSSECSuccess"
"DNSResolver.DNSSECFailure"
"DNSResolver.GetTXTRecord")
":")))
(zero?
(system* "tests/unit_tests/unit_tests"
(string-append "--gtest_filter=-"
excluded-unit-tests))))))
(add-after 'install 'install-blockchain-import-export
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(install-file "bin/monero-blockchain-import" bin)
(install-file "bin/monero-blockchain-export" bin)))))))
(home-page "https://getmonero.org/")
(synopsis "Command-line interface to the Monero currency")
(description
"Monero is a secure, private, untraceable currency. This package provides the
Monero command line client and daemon.")
(license license:bsd-3)))
(define-public monero-core
(package
(name "monero-core")
(version "0.11.0.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/monero-project/monero-core/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0hnrkgwb1sva67pcjym2gvb4zifp2s849dfbnjzbxk3yczpcyqzg"))))
(build-system gnu-build-system)
(native-inputs
`(("doxygen" ,doxygen)
("graphviz" ,graphviz)
("pkg-config" ,pkg-config)))
(inputs
`(("boost" ,boost)
("libunwind" ,libunwind)
("openssl" ,openssl)
("qt" ,qt)
("unbound" ,unbound)))
(propagated-inputs
`(("monero" ,monero)))
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'configure)
(delete 'check)
(add-before 'build 'fix-makefile-vars
(lambda _
(substitute* "src/zxcvbn-c/makefile"
(("\\?=") "="))
#t))
(add-after 'fix-makefile-vars 'fix-library-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "monero-wallet-gui.pro"
(("-L/usr/local/lib") "")
(("-L/usr/local/opt/openssl/lib")
(string-append "-L"
(assoc-ref inputs "openssl")
"/lib"))
(("-L/usr/local/opt/boost/lib")
(string-append "-L"
(assoc-ref inputs "boost")
"/lib")))
#t))
(add-after 'fix-library-paths 'fix-monerod-path
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/daemon/DaemonManager.cpp"
(("QApplication::applicationDirPath\\(\\) \\+ \"/monerod")
(string-append "\""(assoc-ref inputs "monero")
"/bin/monerod")))
#t))
(replace 'build
(lambda _
(zero? (system* "./build.sh"))))
(add-after 'build 'fix-install-path
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "build/Makefile"
(("/opt/monero-wallet-gui")
(assoc-ref outputs "out")))
#t))
(add-before 'install 'change-dir
(lambda _
(chdir "build"))))))
(home-page "https://getmonero.org/")
(synopsis "Graphical user interface for the Monero currency")
(description
"Monero is a secure, private, untraceable currency. This package provides the
Monero GUI client.")
(license license:bsd-3)))

2
gnu/packages/fltk.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

31
gnu/packages/fonts.scm
View File

@ -20,6 +20,7 @@
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org> ;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Mohammed Sadiq <sadiq@sadiqpk.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -514,6 +515,32 @@ fonts.")
;; exceptions. ;; exceptions.
(license license:gpl3))) (license license:gpl3)))
(define-public font-rachana
(package
(name "font-rachana")
(version "7.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://gitlab.com/smc/rachana/repository/archive.tar.gz?ref=Version"
version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0jc091gshna6p1dd6lf507jxkgk6rsja835fc9dm71mcplq53bm1"))))
(build-system font-build-system)
(home-page "https://smc.org.in")
(synopsis "Malayalam font")
(description
"Rachana is a Malayalam font designed by Hussain K H. The project was
part of Rachana Aksharavedi for the original script of Malayalam in computing.
Rachana has about 1,200+ glyphs for Malayalam and contains glyphs required for
printing old Malayalam books without compromising the writing style.")
;; This font is licensed under SIL 1.1 or GPLv3+ with font embedding
;; exceptions.
(license (list license:silofl1.1 license:gpl3+))))
(define-public font-tex-gyre (define-public font-tex-gyre
(package (package
(name "font-tex-gyre") (name "font-tex-gyre")
@ -560,7 +587,7 @@ languages, plus Greek and Cyrillic.")
(define-public font-gnu-unifont (define-public font-gnu-unifont
(package (package
(name "font-gnu-unifont") (name "font-gnu-unifont")
(version "10.0.05") (version "10.0.06")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -568,7 +595,7 @@ languages, plus Greek and Cyrillic.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"07sajc32l2knnz6gmd81zxjhcxq8xr6r2kf42wig56vj05s3d1cb")))) "0z8lglzwbkmya0gmhxd9m1x3nsd7flfsbsh0qy34dzqqdwjpyy2p"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" ; TrueType version (outputs '("out" ; TrueType version
"pcf" ; PCF (bitmap) version "pcf" ; PCF (bitmap) version

37
gnu/packages/fontutils.scm
View File

@ -405,7 +405,7 @@ and returns a sequence of positioned glyphids from the font.")
(define-public potrace (define-public potrace
(package (package
(name "potrace") (name "potrace")
(version "1.14") (version "1.15")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -413,7 +413,7 @@ and returns a sequence of positioned glyphids from the font.")
"/potrace-" version ".tar.gz")) "/potrace-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0znr9i0ljb818qiwm22zw63g11a4v08gc5xkh0wbdp6g259vcwnv")))) "17ajildjp14shsy339xarh1lw1p0k60la08ahl638a73mh23kcx9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("ghostscript" ,ghostscript))) ;for tests (native-inputs `(("ghostscript" ,ghostscript))) ;for tests
(inputs `(("zlib" ,zlib))) (inputs `(("zlib" ,zlib)))
@ -507,26 +507,14 @@ definitions.")
(define-public fontforge (define-public fontforge
(package (package
(name "fontforge") (name "fontforge")
(version "20160404") (version "20170731")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://github.com/fontforge/fontforge/releases/download/" "https://github.com/fontforge/fontforge/releases/download/"
version "/fontforge-dist-" version ".tar.gz")) version "/fontforge-dist-" version ".tar.xz"))
(sha256 (base32 (sha256 (base32
"1kavnhbkzc1hk6f39fynq9s0haama81ddrbld4b5x60d0dbaawvc")) "08l8h3yvk4v7652jvmd3ls7nf5miybkx2fmkf1mpwwfixpxxw2l4"))))
(modules '((guix build utils)))
(snippet
'(begin
;; Make builds bit-reproducible by using fixed date strings.
(substitute* "configure"
(("^FONTFORGE_MODTIME=.*$")
"FONTFORGE_MODTIME=\"1459819518L\"\n")
(("^FONTFORGE_MODTIME_STR=.*$")
"FONTFORGE_MODTIME_STR=\"20:25 CDT 4-Apr-2016\"\n")
(("^FONTFORGE_VERSIONDATE=.*$")
"FONTFORGE_VERSIONDATE=\"20160404\"\n"))))
(patches (list (search-patch "fontforge-svg-modtime.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -550,20 +538,11 @@ definitions.")
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("pango" ,pango) ("pango" ,pango)
("potrace" ,potrace) ("potrace" ,potrace)
("python" ,python) ("python" ,python-wrapper)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
'(#:tests? #f '(#:phases
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'build 'build-contrib
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(and (zero? (system* "make" "-Ccontrib/fonttools"
"CC=gcc" "showttf"))
(begin (install-file "contrib/fonttools/showttf" bin)
#t)))))
(add-after 'install 'set-library-path (add-after 'install 'set-library-path
(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"))
@ -585,4 +564,4 @@ definitions.")
opentype fonts. You can save fonts in many different outline formats, and opentype fonts. You can save fonts in many different outline formats, and
generate bitmaps.") generate bitmaps.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://fontforge.org/"))) (home-page "https://fontforge.github.io/en-US/")))

82
gnu/packages/freedesktop.scm
View File

@ -3,10 +3,10 @@
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015, 2017 Andy Wingo <wingo@pobox.com> ;;; Copyright © 2015, 2017 Andy Wingo <wingo@pobox.com>
;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
@ -204,14 +204,14 @@ the freedesktop.org XDG Base Directory specification.")
(define-public elogind (define-public elogind
(package (package
(name "elogind") (name "elogind")
(version "219.14") (version "232.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://wingolog.org/pub/" name "/" (uri (string-append "https://github.com/elogind/elogind/"
name "-" version ".tar.xz")) "archive/v" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1jckc4wx199n1q4r4fv43ibjs6nlq91s39w9r78ilk1z383m1hcx")) "1qcxian48z2dj5gfmp7brrngdydqf2jm00f4rjr5sy1myh8fy931"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -222,25 +222,58 @@ the freedesktop.org XDG Base Directory specification.")
(("XSLTPROC_FLAGS = ") "XSLTPROC_FLAGS = --novalid")))))) (("XSLTPROC_FLAGS = ") "XSLTPROC_FLAGS = --novalid"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:tests? #f ;FIXME: "make check" in the "po" directory fails.
(list (string-append "--with-libcap=" #:configure-flags
(assoc-ref %build-inputs "libcap")) (list (string-append "--with-udevrulesdir="
(string-append "--with-udevrulesdir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib/udev/rules.d")) "/lib/udev/rules.d")
;; Let elogind be its own cgroup controller, rather than relying
;; on systemd or OpenRC. By default, 'configure' makes an
;; incorrect guess.
"--with-cgroup-controller=elogind"
(string-append "--with-rootprefix="
(assoc-ref %outputs "out"))
(string-append "--with-rootlibexecdir="
(assoc-ref %outputs "out")
"/libexec/elogind")
;; These are needed to ensure that lto linking works.
"RANLIB=gcc-ranlib"
"AR=gcc-ar"
"NM=gcc-nm")
#:make-flags '("PKTTYAGENT=/run/current-system/profile/bin/pkttyagent") #:make-flags '("PKTTYAGENT=/run/current-system/profile/bin/pkttyagent")
#:phases (modify-phases %standard-phases #:phases
(add-before 'build 'fix-service-file (modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (add-before 'configure 'autogen
;; Fix the file name of the 'elogind' binary in the D-Bus (lambda _
;; '.service' file. (and (zero? (system* "intltoolize" "--force" "--automake"))
(substitute* "src/login/org.freedesktop.login1.service" (zero? (system* "autoreconf" "-vif")))))
(("^Exec=.*") (add-before 'build 'fix-service-file
(string-append "Exec=" (assoc-ref %outputs "out") (lambda* (#:key outputs #:allow-other-keys)
"/libexec/elogind/elogind\n")))))))) ;; Fix the file name of the 'elogind' binary in the D-Bus
;; '.service' file.
(substitute* "src/login/org.freedesktop.login1.service"
(("^Exec=.*")
(string-append "Exec=" (assoc-ref %outputs "out")
"/libexec/elogind/elogind\n")))))
(add-after 'install 'add-libcap-to-search-path
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Add a missing '-L' for libcap in libelogind.la. See
;; <https://lists.gnu.org/archive/html/guix-devel/2017-09/msg00084.html>.
(let ((libcap (assoc-ref inputs "libcap"))
(out (assoc-ref outputs "out")))
(substitute* (string-append out "/lib/libelogind.la")
(("-lcap")
(string-append "-L" libcap "/lib -lcap")))
#t))))))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("intltool" ,intltool)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("python" ,python)
("docbook-xsl" ,docbook-xsl) ("docbook-xsl" ,docbook-xsl)
("docbook-xml" ,docbook-xml) ("docbook-xml" ,docbook-xml)
("xsltproc" ,libxslt) ("xsltproc" ,libxslt)
@ -260,7 +293,7 @@ the freedesktop.org XDG Base Directory specification.")
("dbus" ,dbus) ("dbus" ,dbus)
("eudev" ,eudev) ("eudev" ,eudev)
("acl" ,acl))) ;to add individual users to ACLs on /dev nodes ("acl" ,acl))) ;to add individual users to ACLs on /dev nodes
(home-page "https://github.com/wingo/elogind") (home-page "https://github.com/elogind/elogind")
(synopsis "User, seat, and session management service") (synopsis "User, seat, and session management service")
(description "Elogind is the systemd project's \"logind\" service, (description "Elogind is the systemd project's \"logind\" service,
extracted out as a separate project. Elogind integrates with PAM to provide extracted out as a separate project. Elogind integrates with PAM to provide
@ -333,7 +366,10 @@ manager for the current system.")
(substitute* "test/test-icon.py" (substitute* "test/test-icon.py"
(("/usr/share/icons/hicolor/index.theme") (("/usr/share/icons/hicolor/index.theme")
(string-append (assoc-ref inputs "hicolor-icon-theme") (string-append (assoc-ref inputs "hicolor-icon-theme")
"/share/icons/hicolor/index.theme"))) "/share/icons/hicolor/index.theme"))
;; FIXME: This test fails because the theme contains the unknown
;; key "Scale".
(("theme.validate\\(\\)") "#"))
;; One test fails with: ;; One test fails with:
;; AssertionError: 'x-apple-ios-png' != 'png' ;; AssertionError: 'x-apple-ios-png' != 'png'

10
gnu/packages/ftp.scm
View File

@ -46,7 +46,7 @@
(define-public lftp (define-public lftp
(package (package
(name "lftp") (name "lftp")
(version "4.7.8") (version "4.8.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
;; See https://lftp.tech/get.html for mirrors. ;; See https://lftp.tech/get.html for mirrors.
@ -58,7 +58,7 @@
"ftp/lftp/lftp-" version ".tar.xz"))) "ftp/lftp/lftp-" version ".tar.xz")))
(sha256 (sha256
(base32 (base32
"19ijsmbb5589vg5ga355ys3075z6s2x2h0bdbga343hfqmnid2pi")))) "176d90amkm1klwjpfpzdsvmjnyri8f74bv4fpip8app0fs25p1sw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -159,7 +159,7 @@ FTP browser, as well as non-interactive commands such as 'ncftpput' and
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'bootstrap (add-after 'unpack 'bootstrap
(lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (lambda _ (zero? (system* "autoreconf" "-vfi")))))))
(home-page "http://weex.sourceforge.net/") (home-page "http://weex.sourceforge.net/")
(synopsis "Non-interactive client for FTP synchronization") (synopsis "Non-interactive client for FTP synchronization")
@ -173,7 +173,7 @@ as required.")
(define-public libfilezilla (define-public libfilezilla
(package (package
(name "libfilezilla") (name "libfilezilla")
(version "0.10.1") (version "0.11.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -181,7 +181,7 @@ as required.")
name "/" name "-" version ".tar.bz2")) name "/" name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1yi9db0hpxh3giyjhkbz7ajmf95qw27xdvh3xvw208zri5k575x0")))) "1l4yhw269dyarqb2spqhycxzzyfn8pj4qh9vfycdw1c93hj6fx6c"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("cppunit" ,cppunit) `(("cppunit" ,cppunit)

148
gnu/packages/game-development.scm
View File

@ -5,11 +5,13 @@
;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016, 2017 David Thompson <davet@gnu.org> ;;; Copyright © 2015, 2016, 2017 David Thompson <davet@gnu.org>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 Julian Graham <joolean@gmail.com> ;;; Copyright © 2016, 2017 Julian Graham <joolean@gmail.com>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -73,7 +75,8 @@
#:use-module (gnu packages xiph) #:use-module (gnu packages xiph)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages mp3) #:use-module (gnu packages mp3)
#:use-module (gnu packages xml)) #:use-module (gnu packages xml)
#:use-module (gnu packages tls))
(define-public bullet (define-public bullet
(package (package
@ -190,6 +193,31 @@ necessary.
;; The MD5 implementation contained in GRFID is under the zlib license. ;; The MD5 implementation contained in GRFID is under the zlib license.
(license (list license:gpl2 license:gpl2+ license:zlib)))) (license (list license:gpl2 license:gpl2+ license:zlib))))
(define-public catcodec
(package
(name "catcodec")
(version "1.0.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://binaries.openttd.org/extra/catcodec/"
version "/catcodec-" version "-source.tar.xz"))
(sha256
(base32
"1qg0c2i4p29sxj0q6qp2jynlrzm5pphz2xhcjqlxa69ycrnlxzs7"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
#:make-flags (list (string-append "prefix=" %output))
#:phases (modify-phases %standard-phases
(delete 'configure))))
(home-page "http://dev.openttdcoop.org/projects/catcodec")
(synopsis "Encode/decode OpenTTD sounds")
(description "catcodec encodes and decodes sounds for OpenTTD. These
sounds are not much more than some metadata (description and filename) and raw
PCM data.")
(license license:gpl2)))
(define-public gzochi (define-public gzochi
(package (package
(name "gzochi") (name "gzochi")
@ -248,14 +276,14 @@ files) into @file{.grf} and/or @file{.nfo} files.")
(define-public python-sge-pygame (define-public python-sge-pygame
(package (package
(name "python-sge-pygame") (name "python-sge-pygame")
(version "1.5") (version "1.5.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "sge-pygame" version)) (uri (pypi-uri "sge-pygame" version))
(sha256 (sha256
(base32 (base32
"0g0n722md6nfayiqzadwf0dh821hzqv0alp4by0vjfwr1xzv49mc")))) "1rl3xjzh78sl0sq3xl8rl7cgp9v9v3h7s2pfwn7nj1vrmffzkcpd"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-pygame" ,python-pygame) `(("python-pygame" ,python-pygame)
@ -276,7 +304,7 @@ possible, and it also makes the SGE easy to learn.")
(define-public python-tmx (define-public python-tmx
(package (package
(name "python-tmx") (name "python-tmx")
(version "1.9.1") (version "1.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -285,7 +313,7 @@ possible, and it also makes the SGE easy to learn.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1is107sx3lr09dqjiyn10xqhyv5x54c2ryhys9mb9j3mxjbm227l")))) "073q0prg1nzlkga2b45vhscz374206qh4x68ccg00mxxwagn64z0"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-six" ,python-six))) `(("python-six" ,python-six)))
@ -353,7 +381,7 @@ support.")
(define-public tiled (define-public tiled
(package (package
(name "tiled") (name "tiled")
(version "1.0.2") (version "1.0.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/bjorn/tiled/archive/v" (uri (string-append "https://github.com/bjorn/tiled/archive/v"
@ -361,7 +389,7 @@ support.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"134xi74xajh38rj1qhmc4x1zmncfdmqb01axnkxh6zs3qz0rxp93")))) "1qj7l34y5zv2iazmwbix8wdpp88zv7fswbc4arqpp1wak2yna1ix"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
@ -1019,3 +1047,107 @@ with its own editor, called OpenMW-CS which allows the user to edit or create
their own original games.") their own original games.")
(home-page "https://openmw.org") (home-page "https://openmw.org")
(license license:gpl3))) (license license:gpl3)))
(define-public godot
(package
(name "godot")
(version "2.1.4")
(source (origin
(method url-fetch)
(uri
(string-append "https://github.com/godotengine/godot/archive/"
version "-stable.tar.gz"))
(file-name (string-append name "-" version))
(sha256
(base32 "1mz89nafc1m7srbqvy7iagxrxmqvf5hbqi7i0lwaapkx6q0kpkq7"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; There are no tests
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'scons-use-env
(lambda _
;; Scons does not use the environment variables by default,
;; but this substitution makes it do so.
(substitute* "SConstruct"
(("env_base = Environment\\(tools=custom_tools\\)")
(string-append
"env_base = Environment(tools=custom_tools)\n"
"env_base = Environment(ENV=os.environ)")))
#t))
(replace 'build
(lambda _
(zero? (system*
"scons"
"platform=x11"
;; Avoid using many of the bundled libs.
;; Note: These options can be found in the SConstruct file.
"builtin_freetype=no"
"builtin_glew=no"
"builtin_libmpdec=no"
"builtin_libogg=no"
"builtin_libpng=no"
"builtin_libtheora=no"
"builtin_libvorbis=no"
"builtin_libwebp=no"
"builtin_openssl=no"
"builtin_opus=no"
"builtin_zlib=no"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(with-directory-excursion "bin"
(if (file-exists? "godot.x11.tools.64")
(rename-file "godot.x11.tools.64" "godot")
(rename-file "godot.x11.tools.32" "godot"))
(install-file "godot" bin)))))
(add-after 'install 'install-godot-desktop
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(desktop (string-append out "/share/applications"))
(icon-dir (string-append out "/share/pixmaps")))
(mkdir-p desktop)
(mkdir-p icon-dir)
(rename-file "icon.png" "godot.png")
(install-file "godot.png" icon-dir)
(with-output-to-file
(string-append desktop "/godot.desktop")
(lambda _
(format #t
"[Desktop Entry]~@
Name=godot~@
Comment=The godot game engine~@
Exec=~a/bin/godot~@
TryExec=~@*~a/bin/godot~@
Icon=godot~@
Type=Application~%"
out)))
#t))))))
(native-inputs `(("pkg-config" ,pkg-config)
("scons" ,scons)))
(inputs `(("alsa-lib" ,alsa-lib)
("freetype" ,freetype)
("glew" ,glew)
("glu" ,glu)
("libtheora" ,libtheora)
("libvorbis" ,libvorbis)
("libwebp" ,libwebp)
("libx11" ,libx11)
("libxcursor" ,libxcursor)
("libxinerama" ,libxinerama)
("libxrandr" ,libxrandr)
("mesa" ,mesa)
("openssl" ,openssl)
("opusfile" ,opusfile)
("pulseaudio" ,pulseaudio)
("python2" ,python-2)))
(home-page "https://godotengine.org/")
(synopsis "Advanced 2D and 3D game engine")
(description
"Godot is an advanced multi-platform game engine written in C++. If
features design tools such as a visual editor, can import 3D models and
provide high-quality 3D rendering, it contains an animation editor, and can be
scripted in a Python-like language.")
(license license:expat)))

148
gnu/packages/games.scm
View File

@ -19,7 +19,7 @@
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org> ;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2016 Albin Söderqvist <albin@fripost.org> ;;; Copyright © 2016 Albin Söderqvist <albin@fripost.org>
;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
@ -522,7 +522,7 @@ watch your CPU playing while enjoying a cup of tea!")
(define-public retux (define-public retux
(package (package
(name "retux") (name "retux")
(version "1.3.4") (version "1.3.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/retux/" (uri (string-append "mirror://savannah/retux/"
@ -530,7 +530,7 @@ watch your CPU playing while enjoying a cup of tea!")
version "-src.tar.gz")) version "-src.tar.gz"))
(sha256 (sha256
(base32 (base32
"1wgvh3q96kfgymb2jpd58xsms9hmckhhc4fq7v2k61gh2l11cvdj")))) "1pcrh3z16fl412r3k7xccrgika19ahb1xh90jihgl8yy7zza2i6p"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
@ -2427,17 +2427,19 @@ and a game metadata scraper.")
;; The build process fails if the configure script is passed the ;; The build process fails if the configure script is passed the
;; option "--enable-fast-install". ;; option "--enable-fast-install".
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs (configure-flags '())
#:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(lzo (assoc-ref inputs "lzo"))) (lzo (assoc-ref inputs "lzo")))
(zero? (zero?
(system* "./configure" (apply system* "./configure"
(string-append "--prefix=" out) (string-append "--prefix=" out)
;; Provide the "lzo" path. ;; Provide the "lzo" path.
(string-append "--with-liblzo2=" (string-append "--with-liblzo2="
lzo "/lib/liblzo2.a") lzo "/lib/liblzo2.a")
;; Put the binary in 'bin' instead of 'games'. ;; Put the binary in 'bin' instead of 'games'.
"--binary-dir=bin")))))))) "--binary-dir=bin"
configure-flags))))))))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs (inputs
`(("allegro" ,allegro-4) `(("allegro" ,allegro-4)
@ -2464,10 +2466,6 @@ engine. When you start it you will be prompted to download a graphics set.")
;; different terms. ;; different terms.
(license (list license:bsd-3 license:gpl2 license:lgpl2.1+ license:zlib)))) (license (list license:bsd-3 license:gpl2 license:lgpl2.1+ license:zlib))))
;; TODO Add 'openttd-opengfx' and 'openttd-openmsx' packages and make
;; 'openttd' a wrapper around them. The engine is playable by itself,
;; but it asks a user to download graphics if it's not found.
(define openttd-opengfx (define openttd-opengfx
(package (package
(name "openttd-opengfx") (name "openttd-opengfx")
@ -2485,7 +2483,7 @@ engine. When you start it you will be prompted to download a graphics set.")
'(#:make-flags (list "CC=gcc" '(#:make-flags (list "CC=gcc"
(string-append "INSTALL_DIR=" (string-append "INSTALL_DIR="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/share/openttd/baseset")) "/share/games/openttd/baseset/opengfx"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -2503,7 +2501,8 @@ engine. When you start it you will be prompted to download a graphics set.")
;; different software versions than upstream does, some of the md5sums ;; different software versions than upstream does, some of the md5sums
;; are different. However, the package is still reproducible, it's safe ;; are different. However, the package is still reproducible, it's safe
;; to disable this test. ;; to disable this test.
#:tests? #f)) #:tests? #f
#:parallel-build? #f))
(native-inputs `(("dos2unix" ,dos2unix) (native-inputs `(("dos2unix" ,dos2unix)
("gimp" ,gimp) ("gimp" ,gimp)
("grfcodec" ,grfcodec) ("grfcodec" ,grfcodec)
@ -2525,27 +2524,108 @@ OpenGFX provides you with...
@end enumerate") @end enumerate")
(license license:gpl2))) (license license:gpl2)))
(define openttd-opensfx
(package
(name "openttd-opensfx")
(version "0.2.3")
(source
(origin
(method url-fetch)
(uri (string-append
"https://binaries.openttd.org/extra/opensfx/"
version "/opensfx-" version "-source.tar.gz"))
(sha256
(base32
"03jxgp02ks31hmsdh4xh0xcpkb70ds8jakc9pfc1y9vdrdavh4p5"))))
(build-system gnu-build-system)
(native-inputs
`(("catcodec" ,catcodec)
("python" ,python2-minimal)))
(arguments
`(#:make-flags
(list (string-append "INSTALL_DIR=" %output
"/share/games/openttd/baseset/opensfx"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'make-reproducible
(lambda _
;; Remove the time dependency of the installed tarball by setting
;; the modification times if its members to 0.
(substitute* "scripts/Makefile.def"
(("-cf") " --mtime=@0 -cf"))
#t))
(delete 'configure))))
(home-page "http://dev.openttdcoop.org/projects/opensfx")
(synopsis "Base sounds for OpenTTD")
(description "OpenSFX is a set of free base sounds for OpenTTD which make
it possible to play OpenTTD without requiring the proprietary sound files from
the original Transport Tycoon Deluxe.")
(license license:cc-sampling-plus-1.0)))
(define openttd-openmsx
(package
(name "openttd-openmsx")
(version "0.3.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://binaries.openttd.org/extra/openmsx/"
version "/openmsx-" version "-source.tar.gz"))
(sha256
(base32
"0nskq97a6fsv1v6d62zf3yb8whzhqnlh3lap3va3nzvj7csjgf7c"))))
(build-system gnu-build-system)
(native-inputs
`(("python" ,python2-minimal)))
(arguments
`(#:make-flags
(list (string-append "INSTALL_DIR=" %output
"/share/games/openttd/baseset"))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'install 'post-install
;; Rename openmsx-version to openmsx
(lambda* (#:key outputs #:allow-other-keys)
(let ((install-directory (string-append (assoc-ref outputs "out")
"/share/games/openttd/baseset")))
(rename-file (string-append install-directory "/openmsx-" ,version)
(string-append install-directory "/openmsx"))
#t))))))
(home-page "http://dev.openttdcoop.org/projects/openmsx")
(synopsis "Music set for OpenTTD")
(description "OpenMSX is a music set for OpenTTD which makes it possible
to play OpenTTD without requiring the proprietary music from the original
Transport Tycoon Deluxe.")
(license license:gpl2)))
(define-public openttd (define-public openttd
(package (package
(inherit openttd-engine) (inherit openttd-engine)
(name "openttd") (name "openttd")
(arguments (arguments
(substitute-keyword-arguments (package-arguments openttd-engine) `(#:configure-flags
((#:phases phases) (list (string-append "--with-midi=" (assoc-ref %build-inputs "timidity++")
`(modify-phases ,phases "/bin/timidity"))
(add-after 'install 'install-data ,@(substitute-keyword-arguments (package-arguments openttd-engine)
(lambda* (#:key inputs outputs #:allow-other-keys) ((#:phases phases)
(let* `(modify-phases ,phases
((opengfx (assoc-ref inputs "opengfx")) (add-after 'install 'install-data
(out (assoc-ref outputs "out")) (lambda* (#:key inputs outputs #:allow-other-keys)
(gfx-dir (for-each
(string-append out (lambda (input)
"/share/games/openttd/baseset/opengfx"))) (copy-recursively (assoc-ref inputs input)
(mkdir-p gfx-dir) (assoc-ref outputs "out")))
(copy-recursively opengfx gfx-dir)) (list "opengfx" "openmsx" "opensfx"))
#t)))))) #t)))))))
(inputs
`(("timidity++" ,timidity++)
,@(package-inputs openttd-engine)))
(native-inputs (native-inputs
`(("opengfx" ,openttd-opengfx) `(("opengfx" ,openttd-opengfx)
("openmsx" ,openttd-openmsx)
("opensfx" ,openttd-opensfx)
,@(package-native-inputs openttd-engine))))) ,@(package-native-inputs openttd-engine)))))
(define-public pinball (define-public pinball
@ -3632,7 +3712,7 @@ throwing people around in pseudo-randomly generated buildings.")
(define-public hyperrogue (define-public hyperrogue
(package (package
(name "hyperrogue") (name "hyperrogue")
(version "10.0e") (version "10.0g")
;; When updating this package, be sure to update the "hyperrogue-data" ;; When updating this package, be sure to update the "hyperrogue-data"
;; origin in native-inputs. ;; origin in native-inputs.
(source (origin (source (origin
@ -3643,7 +3723,7 @@ throwing people around in pseudo-randomly generated buildings.")
"-src.tgz")) "-src.tgz"))
(sha256 (sha256
(base32 (base32
"1p6fam73khhys54098qsgmp52d0rnqc3k5hknjig0znvfb2kwi38")))) "0f68pcnsgl406dhm91ckn3f364bar9m9i5njp9vrmvhvv9p2icy0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
@ -3718,7 +3798,7 @@ throwing people around in pseudo-randomly generated buildings.")
"-win.zip")) "-win.zip"))
(sha256 (sha256
(base32 (base32
"1z9w3nd57ybnf4w7ckhhp5vfws2hwd8x26fx6h496f6160fgcj6m")))) "0bnp077qvlmxjlz1jjd6kpghlv9flxc19ac1xq3m3wyq1w9p3pab"))))
("unzip" ,unzip))) ("unzip" ,unzip)))
(inputs (inputs
`(("font-dejavu" ,font-dejavu) `(("font-dejavu" ,font-dejavu)

112
gnu/packages/gcc.scm
View File

@ -150,8 +150,6 @@ where the OS part is overloaded to denote a specific ABI---into GCC
(inputs `(("gmp" ,gmp) (inputs `(("gmp" ,gmp)
("mpfr" ,mpfr) ("mpfr" ,mpfr)
("mpc" ,mpc) ("mpc" ,mpc)
("isl" ,isl)
("cloog" ,cloog)
("libelf" ,libelf) ("libelf" ,libelf)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -354,10 +352,14 @@ Go. It also includes runtime support libraries for these languages.")
(base32 (base32
"08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2")) "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2"))
(patches (search-patches "gcc-arm-link-spec-fix.patch")))) (patches (search-patches "gcc-arm-link-spec-fix.patch"))))
(supported-systems %supported-systems))) (supported-systems %supported-systems)
(inputs
`(("isl" ,isl-0.11)
("cloog" ,cloog)
,@(package-inputs gcc-4.7)))))
(define-public gcc-4.9 (define-public gcc-4.9
(package (inherit gcc-4.7) (package (inherit gcc-4.8)
(version "4.9.4") (version "4.9.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -368,8 +370,7 @@ Go. It also includes runtime support libraries for these languages.")
"14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc")) "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc"))
(patches (search-patches "gcc-arm-bug-71399.patch" (patches (search-patches "gcc-arm-bug-71399.patch"
"gcc-libvtv-runpath.patch")))) "gcc-libvtv-runpath.patch"))))
(native-inputs `(("texinfo" ,texinfo))) (native-inputs `(("texinfo" ,texinfo)))))
(supported-systems %supported-systems)))
(define-public gcc-5 (define-public gcc-5
;; Note: GCC >= 5 ships with .info files but 'make install' fails to install ;; Note: GCC >= 5 ships with .info files but 'make install' fails to install
@ -389,6 +390,10 @@ Go. It also includes runtime support libraries for these languages.")
"gcc-5.0-libvtv-runpath.patch" "gcc-5.0-libvtv-runpath.patch"
"gcc-5-source-date-epoch-1.patch" "gcc-5-source-date-epoch-1.patch"
"gcc-5-source-date-epoch-2.patch")))))) "gcc-5-source-date-epoch-2.patch"))))))
;; TODO: gcc-5 doesn't need cloog.
;;(inputs
;; `(("isl" ,isl)
;; ,@(package-inputs gcc-4.7)))))
(define-public gcc-6 (define-public gcc-6
(package (package
@ -402,7 +407,11 @@ Go. It also includes runtime support libraries for these languages.")
(base32 (base32
"1m0lr7938lw5d773dkvwld90hjlcq2282517d1gwvrfzmwgg42w5")) "1m0lr7938lw5d773dkvwld90hjlcq2282517d1gwvrfzmwgg42w5"))
(patches (search-patches "gcc-strmov-store-file-names.patch" (patches (search-patches "gcc-strmov-store-file-names.patch"
"gcc-5.0-libvtv-runpath.patch")))))) "gcc-5.0-libvtv-runpath.patch"))))
(inputs
`(("isl" ,isl)
,@(package-inputs gcc-4.7)))))
(define-public gcc-7 (define-public gcc-7
(package (package
(inherit gcc-6) (inherit gcc-6)
@ -415,7 +424,11 @@ Go. It also includes runtime support libraries for these languages.")
(base32 (base32
"16j7i0888j2f1yp9l0nhji6cq65dy6y4nwy8868a8njbzzwavxqw")) "16j7i0888j2f1yp9l0nhji6cq65dy6y4nwy8868a8njbzzwavxqw"))
(patches (search-patches "gcc-strmov-store-file-names.patch" (patches (search-patches "gcc-strmov-store-file-names.patch"
"gcc-5.0-libvtv-runpath.patch")))))) "gcc-5.0-libvtv-runpath.patch"))))
(description
"GCC is the GNU Compiler Collection. It provides compiler front-ends
for several languages, including C, C++, Objective-C, Fortran, Ada, and Go.
It also includes runtime support libraries for these languages.")))
;; Note: When changing the default gcc version, update ;; Note: When changing the default gcc version, update
;; the gcc-toolchain-* definitions and the gfortran definition ;; the gcc-toolchain-* definitions and the gfortran definition
@ -581,7 +594,34 @@ as the 'native-search-paths' field."
(variable "LIBRARY_PATH") (variable "LIBRARY_PATH")
(files '("lib" "lib64")))))) (files '("lib" "lib64"))))))
(define-public gcc-objc gcc-objc-4.9) (define-public gcc-objc-5
(custom-gcc gcc-5 "gcc-objc" '("objc")
(list (search-path-specification
(variable "OBJC_INCLUDE_PATH")
(files '("include")))
(search-path-specification
(variable "LIBRARY_PATH")
(files '("lib" "lib64"))))))
(define-public gcc-objc-6
(custom-gcc gcc-6 "gcc-objc" '("objc")
(list (search-path-specification
(variable "OBJC_INCLUDE_PATH")
(files '("include")))
(search-path-specification
(variable "LIBRARY_PATH")
(files '("lib" "lib64"))))))
(define-public gcc-objc-7
(custom-gcc gcc-7 "gcc-objc" '("objc")
(list (search-path-specification
(variable "OBJC_INCLUDE_PATH")
(files '("include")))
(search-path-specification
(variable "LIBRARY_PATH")
(files '("lib" "lib64"))))))
(define-public gcc-objc gcc-objc-5)
(define-public gcc-objc++-4.8 (define-public gcc-objc++-4.8
(custom-gcc gcc-4.8 "gcc-objc++" '("obj-c++") (custom-gcc gcc-4.8 "gcc-objc++" '("obj-c++")
@ -601,7 +641,34 @@ as the 'native-search-paths' field."
(variable "LIBRARY_PATH") (variable "LIBRARY_PATH")
(files '("lib" "lib64")))))) (files '("lib" "lib64"))))))
(define-public gcc-objc++ gcc-objc++-4.9) (define-public gcc-objc++-5
(custom-gcc gcc-5 "gcc-objc++" '("obj-c++")
(list (search-path-specification
(variable "OBJCPLUS_INCLUDE_PATH")
(files '("include")))
(search-path-specification
(variable "LIBRARY_PATH")
(files '("lib" "lib64"))))))
(define-public gcc-objc++-6
(custom-gcc gcc-6 "gcc-objc++" '("obj-c++")
(list (search-path-specification
(variable "OBJCPLUS_INCLUDE_PATH")
(files '("include")))
(search-path-specification
(variable "LIBRARY_PATH")
(files '("lib" "lib64"))))))
(define-public gcc-objc++-7
(custom-gcc gcc-7 "gcc-objc++" '("obj-c++")
(list (search-path-specification
(variable "OBJCPLUS_INCLUDE_PATH")
(files '("include")))
(search-path-specification
(variable "LIBRARY_PATH")
(files '("lib" "lib64"))))))
(define-public gcc-objc++ gcc-objc++-5)
(define (make-libstdc++-doc gcc) (define (make-libstdc++-doc gcc)
"Return a package with the libstdc++ documentation for GCC." "Return a package with the libstdc++ documentation for GCC."
@ -661,7 +728,7 @@ as the 'native-search-paths' field."
(define-public isl (define-public isl
(package (package
(name "isl") (name "isl")
(version "0.11.1") (version "0.18")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append (uri (list (string-append
@ -672,8 +739,7 @@ as the 'native-search-paths' field."
name "-" version ".tar.gz"))) name "-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9")) "06ybml6llhi4i56q90jnimbcgk1lpcdwhy9nxdxra2hxz3bhz2vb"))))
(patches (search-patches "isl-0.11.1-aarch64-support.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("gmp" ,gmp))) (inputs `(("gmp" ,gmp)))
(home-page "http://isl.gforge.inria.fr/") (home-page "http://isl.gforge.inria.fr/")
@ -691,6 +757,24 @@ reduction, transitive closures on maps (which may encode infinite graphs),
dependence analysis and bounds on piecewise step-polynomials.") dependence analysis and bounds on piecewise step-polynomials.")
(license lgpl2.1+))) (license lgpl2.1+)))
(define-public isl-0.11
(package
(inherit isl)
(name "isl")
(version "0.11.1")
(source (origin
(method url-fetch)
(uri (list (string-append
"http://isl.gforge.inria.fr/isl-"
version
".tar.bz2")
(string-append %gcc-infrastructure
name "-" version ".tar.gz")))
(sha256
(base32
"13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9"))
(patches (search-patches "isl-0.11.1-aarch64-support.patch"))))))
(define-public cloog (define-public cloog
(package (package
(name "cloog") (name "cloog")
@ -710,7 +794,7 @@ dependence analysis and bounds on piecewise step-polynomials.")
(file-name (string-append name "-" version ".tar.gz")))) (file-name (string-append name "-" version ".tar.gz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("gmp" ,gmp) (inputs `(("gmp" ,gmp)
("isl" ,isl))) ("isl" ,isl-0.11)))
(arguments '(#:configure-flags '("--with-isl=system"))) (arguments '(#:configure-flags '("--with-isl=system")))
(home-page "http://www.cloog.org/") (home-page "http://www.cloog.org/")
(synopsis "Library to generate code for scanning Z-polyhedra") (synopsis "Library to generate code for scanning Z-polyhedra")

20
gnu/packages/gd.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -37,12 +38,11 @@
(define-public gd (define-public gd
(package (package
(name "gd") (name "gd")
(replacement gd-2.2.5)
;; Note: With libgd.org now pointing to github.com, genuine old ;; Note: With libgd.org now pointing to github.com, genuine old
;; tarballs are no longer available. Notably, versions 2.0.x are ;; tarballs are no longer available. Notably, versions 2.0.x are
;; missing. ;; missing.
(version "2.2.4") (version "2.2.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -93,6 +93,22 @@ most common applications of GD involve website development.")
"See COPYING file in the distribution.")) "See COPYING file in the distribution."))
(properties '((cpe-name . "libgd"))))) (properties '((cpe-name . "libgd")))))
;; For CVE-2017-6362 and CVE-2017-7890.
(define-public gd-2.2.5
(package
(inherit gd)
(version "2.2.5")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/libgd/libgd/releases/download/gd-"
version "/libgd-" version ".tar.xz"))
(patches (search-patches "gd-fix-tests-on-i686.patch"
"gd-freetype-test-failure.patch"))
(sha256
(base32
"0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c"))))))
(define-public perl-gd (define-public perl-gd
(package (package
(name "perl-gd") (name "perl-gd")

4
gnu/packages/gdb.scm
View File

@ -37,14 +37,14 @@
(define-public gdb (define-public gdb
(package (package
(name "gdb") (name "gdb")
(version "8.0") (version "8.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/gdb/gdb-" (uri (string-append "mirror://gnu/gdb/gdb-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1vplyf8v70yn0rdqjx6awl9nmfbwaj5ynwwjxwa71rhp97z4z8pn")))) "1qwmcbaxf0jc7yjl0fimgcfj2yqcrl6h7azgs1d838kbwf9mzg9x"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; FIXME "make check" fails on single-processor systems. `(#:tests? #f ; FIXME "make check" fails on single-processor systems.

321
gnu/packages/gnome.scm
View File

@ -14,18 +14,19 @@
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net> ;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net>
;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017 nee <nee-git@hidamari.blue> ;;; Copyright © 2017 nee <nee-git@hidamari.blue>
;;; Copyright © 2017 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2017 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Mohammed Sadiq <sadiq@sadiqpk.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -51,6 +52,7 @@
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system meson)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
@ -138,6 +140,7 @@
#:use-module (gnu packages fonts) #:use-module (gnu packages fonts)
#:use-module (gnu packages speech) #:use-module (gnu packages speech)
#:use-module (gnu packages virtualization) #:use-module (gnu packages virtualization)
#:use-module (gnu packages vpn)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public brasero (define-public brasero
@ -312,7 +315,7 @@ either on a local, or remote machine via a number of methods.")
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'run-autogen (add-after 'unpack 'run-autogen
(lambda _ (lambda _
(system* "sh" "autogen.sh")))))) (system* "sh" "autogen.sh"))))))
(home-page "https://wiki.gnome.org/Apps/Dia") (home-page "https://wiki.gnome.org/Apps/Dia")
@ -765,7 +768,7 @@ on the GNOME Desktop with a single simple application.")
(define-public gsettings-desktop-schemas (define-public gsettings-desktop-schemas
(package (package
(name "gsettings-desktop-schemas") (name "gsettings-desktop-schemas")
(version "3.24.0") (version "3.24.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -774,7 +777,7 @@ on the GNOME Desktop with a single simple application.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"145vpcljy4660cnk8zk91qf7ywa7hqfl5hhw025gy8hxcqzklmzn")))) "19zfqy58missq5cck13ip8j824hb9whqg2c4cr6hgrlxkwqgm8vn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("glib" ,glib))) `(("glib" ,glib)))
@ -932,7 +935,7 @@ database is translated at Transifex.")
(define-public hicolor-icon-theme (define-public hicolor-icon-theme
(package (package
(name "hicolor-icon-theme") (name "hicolor-icon-theme")
(version "0.15") (version "0.17")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -940,7 +943,7 @@ database is translated at Transifex.")
"hicolor-icon-theme-" version ".tar.xz")) "hicolor-icon-theme-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1k1kf2c5zbqh31nglc3nxs9j6wr083k9kjyql8p22ccc671mmi4w")))) "1n59i3al3zx6p90ff0l43gzpzmlqnzm6hf5cryxqrlbi48sq8x1i"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f)) ; no check target `(#:tests? #f)) ; no check target
@ -987,7 +990,7 @@ some form of information without getting in the user's way.")
(define-public libpeas (define-public libpeas
(package (package
(name "libpeas") (name "libpeas")
(version "1.20.0") (version "1.22.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -996,12 +999,11 @@ some form of information without getting in the user's way.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0m6k6fcrx40n92nc1cy3z72vs1ja49sb58dj3fjp40605pzgz4pk")))) "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gtk+" ,gtk+) `(("gtk+" ,gtk+)
("glade" ,glade3) ("glade" ,glade3)
("libxml2" ,libxml2) ; XXX: required by gladeui-2.0.pc
("python" ,python) ("python" ,python)
("python-pygobject" ,python-pygobject))) ("python-pygobject" ,python-pygobject)))
(native-inputs (native-inputs
@ -2647,7 +2649,7 @@ floating in an ocean using only your brain and a little bit of luck.")
(define-public gnome-sudoku (define-public gnome-sudoku
(package (package
(name "gnome-sudoku") (name "gnome-sudoku")
(version "3.24.0") (version "3.26.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2656,7 +2658,7 @@ floating in an ocean using only your brain and a little bit of luck.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1mw5ykk7wr0r9770jj5270f07rjws0pmpjs0b1fywj4li13r98h4")))) "186k2axryn3ic8blc9ddnvyrqqf88khg2hlisfa1n4wp784wfx47"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -2963,11 +2965,20 @@ service via the system message bus.")
(substitute* "data/Locations.xml" (substitute* "data/Locations.xml"
(("Asia/Rangoon") (("Asia/Rangoon")
"Asia/Yangon")) "Asia/Yangon"))
#t))))) #t))
(replace 'install
(lambda _
(zero?
(system* "make"
;; Install vala bindings into $out.
(string-append "vapidir=" %output
"/share/vala/vapi")
"install")))))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums `(("glib:bin" ,glib "bin") ; for glib-mkenums
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("vala" ,vala)
("intltool" ,intltool))) ("intltool" ,intltool)))
(propagated-inputs (propagated-inputs
;; gweather-3.0.pc refers to GTK+, GDK-Pixbuf, GLib/GObject, libxml, and ;; gweather-3.0.pc refers to GTK+, GDK-Pixbuf, GLib/GObject, libxml, and
@ -2989,7 +3000,7 @@ services for numerous locations.")
(define-public gnome-settings-daemon (define-public gnome-settings-daemon
(package (package
(name "gnome-settings-daemon") (name "gnome-settings-daemon")
(version "3.24.2") (version "3.24.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2998,7 +3009,7 @@ services for numerous locations.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1jnw920zn4cadhgmcv2q5ylzqhwm1rmrhf3a14q8mvp38hkdgaaa")))) "14w5jhpq02mbcxvn41qcj3cjfqdr3sgzl96c6glwpdrjphw61i38"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(;; Color management test can't reach the colord system service. `(;; Color management test can't reach the colord system service.
@ -3331,7 +3342,7 @@ GL based interactive canvas library.")
(define-public libchamplain (define-public libchamplain
(package (package
(name "libchamplain") (name "libchamplain")
(version "0.12.15") (version "0.12.16")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -3339,7 +3350,7 @@ GL based interactive canvas library.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0x5qa1aw1y59lzkmf4j4szspn49341a87vcja4ydgxny1chilwjl")))) "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:configure-flags '("--enable-vala"))) (arguments '(#:configure-flags '("--enable-vala")))
(native-inputs (native-inputs
@ -3399,7 +3410,7 @@ queries upon that data.")
(define-public libgnome-games-support (define-public libgnome-games-support
(package (package
(name "libgnome-games-support") (name "libgnome-games-support")
(version "1.2.2") (version "1.2.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -3407,7 +3418,7 @@ queries upon that data.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"04qbgcgmc01sinhbqdljiny8q868l01nkdawj8wrnqnd1i8czvsg")))) "1vwad7kqy7yd6wqyr71nq0blh7m53r3lz6ya16dmh942kd0w48v1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -3435,7 +3446,7 @@ GNOME Games, but it may be used by others.")
(define-public gnome-klotski (define-public gnome-klotski
(package (package
(name "gnome-klotski") (name "gnome-klotski")
(version "3.22.1") (version "3.22.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -3443,7 +3454,7 @@ GNOME Games, but it may be used by others.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"04ragvrz29sydi2kf1zk2aimi3b3hn34jrndfd2lx6h8l45anq3q")))) "16hd6yk01rhb4pj8m01fyn72wykf41d72gsms81q0n4zm5bm1a4h"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("desktop-file-utils" ,desktop-file-utils) `(("desktop-file-utils" ,desktop-file-utils)
@ -4087,7 +4098,7 @@ a secret password store, an adblocker, and a modern UI.")
(define-public epiphany (define-public epiphany
(package (package
(name "epiphany") (name "epiphany")
(version "3.24.3") (version "3.24.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -4095,7 +4106,7 @@ a secret password store, an adblocker, and a modern UI.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0m51cclpnb7lxk8w526rriyb2bi3aj17fbcvikhkg7qd65v1dxgy")))) "1jg59s98aljf603w24r5a3cr4fw6z88gc0warqy1946iprjgdw0m"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
;; FIXME: tests run under Xvfb, but fail with: ;; FIXME: tests run under Xvfb, but fail with:
@ -4719,7 +4730,6 @@ to display dialog boxes from the commandline and shell scripts.")
("cairo" ,cairo) ("cairo" ,cairo)
("gdk-pixbuf" ,gdk-pixbuf) ("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib) ("glib" ,glib)
("glib" ,glib)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("json-glib" ,json-glib) ("json-glib" ,json-glib)
("libinput" ,libinput) ("libinput" ,libinput)
@ -4760,7 +4770,7 @@ window manager.")
(define-public gnome-online-accounts (define-public gnome-online-accounts
(package (package
(name "gnome-online-accounts") (name "gnome-online-accounts")
(version "3.24.2") (version "3.24.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -4768,7 +4778,7 @@ window manager.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1fmgywfcvlb5sa0slxxlg80gafiaal8vnq6h5lcybqa12lnxa2mp")))) "0m1qf2ffxzmwxa157lrvh3507d5gr3lg4kvj653zhcihjpmmhbi5"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
@ -4923,7 +4933,7 @@ users.")
(define-public network-manager (define-public network-manager
(package (package
(name "network-manager") (name "network-manager")
(version "1.8.0") (version "1.8.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/NetworkManager/" (uri (string-append "mirror://gnome/sources/NetworkManager/"
@ -4931,7 +4941,7 @@ users.")
"NetworkManager-" version ".tar.xz")) "NetworkManager-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"17pn7kzilyl0qk525gp9xnbz4x0ssrdmgk1lvw95pyfd6rm5qnps")) "1x0vzxvrck0snga2n3pc7g74m20zz74cr4r8gfspl8sckv6yz9bi"))
(snippet (snippet
'(begin '(begin
(use-modules (guix build utils)) (use-modules (guix build utils))
@ -5044,6 +5054,39 @@ services.")
(license license:gpl2+) (license license:gpl2+)
(properties '((upstream-name . "NetworkManager"))))) (properties '((upstream-name . "NetworkManager")))))
(define-public network-manager-openvpn
(package
(name "network-manager-openvpn")
(version "1.2.10")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/NetworkManager-openvpn/"
(version-major+minor version)
"/NetworkManager-openvpn-" version ".tar.xz"))
(sha256
(base32
"0q9x61fq509gybz3ljzyvf9zn8nlya1r2vk7jl0gk3fp76jsg1mc"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--enable-absolute-paths")))
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)))
(inputs
`(("gtk+" ,gtk+)
("openvpn" ,openvpn)
("network-manager" ,network-manager)
("network-manager-applet" ,network-manager-applet) ;for libnma
("libsecret" ,libsecret)))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "OpenVPN plug-in for NetworkManager")
(description
"This extension of NetworkManager allows it to take care of connections
to virtual private networks (VPNs) via OpenVPN.")
(license license:gpl2+)
(properties `((upstream-name . "NetworkManager-openvpn")))))
(define-public mobile-broadband-provider-info (define-public mobile-broadband-provider-info
(package (package
(name "mobile-broadband-provider-info") (name "mobile-broadband-provider-info")
@ -5262,7 +5305,7 @@ providing graphical log-ins and managing local and remote displays.")
(define-public libgtop (define-public libgtop
(package (package
(name "libgtop") (name "libgtop")
(version "2.36.0") (version "2.38.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -5270,7 +5313,7 @@ providing graphical log-ins and managing local and remote displays.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0ax17c7nplghxgsf8zl92nmhkbnggj62wwzl7nq00aqb2m6f7gqk")))) "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("gobject-introspection" ,gobject-introspection) `(("gobject-introspection" ,gobject-introspection)
@ -5546,7 +5589,7 @@ easy, safe, and automatic.")
(define-public tracker (define-public tracker
(package (package
(name "tracker") (name "tracker")
(version "1.12.2") (version "1.12.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -5554,7 +5597,7 @@ easy, safe, and automatic.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1zdzh8l5ahi906i40i4pqw2cs1hwrl6l9a7fp344a3idk3pl5szb")))) "1mpq418lzba7fad0w0m3bnxvz3khf461b5zya8zmq5n1g0w99ki3"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("gnome-common" ,gnome-common) `(("gnome-common" ,gnome-common)
@ -5925,6 +5968,34 @@ specified duration and save it as a GIF encoded animated image file.")
(home-page "https://git.gnome.org/browse/byzanz") (home-page "https://git.gnome.org/browse/byzanz")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public gsound
(package
(name "gsound")
(version "1.0.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"0lwfwx2c99qrp08pfaj59pks5dphsnxjgrxyadz065d8xqqgza5v"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("gobject-introspection" ,gobject-introspection)
("vala" ,vala)))
(inputs
`(("glib" ,glib)
("libcanberra" ,libcanberra)))
(home-page "https://wiki.gnome.org/Projects/GSound")
(synopsis "GObject wrapper for libcanberra")
(description
"GSound is a small library for playing system sounds. It's designed to be
used via GObject Introspection, and is a thin wrapper around the libcanberra C
library.")
(license license:lgpl2.1+)))
(define-public libzapojit (define-public libzapojit
(package (package
(name "libzapojit") (name "libzapojit")
@ -5953,6 +6024,44 @@ specified duration and save it as a GIF encoded animated image file.")
Microsoft SkyDrive and Hotmail, using their REST protocols.") Microsoft SkyDrive and Hotmail, using their REST protocols.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public gnome-clocks
(package
(name "gnome-clocks")
(version "3.26.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"00a5bqi1hbyb9kbl4p393l1g6rddl2y6ljxjby9c5j3k1qka0c0g"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t))
(native-inputs
`(("vala" ,vala)
("pkg-config" ,pkg-config)
("glib" ,glib "bin") ; for glib-compile-resources
("gtk+-bin" ,gtk+ "bin") ; for gtk-update-icon-cache
("desktop-file-utils" ,desktop-file-utils)
("gettext" ,gettext-minimal)
("itstool" ,itstool)))
(inputs
`(("glib" ,glib)
("gtk+" ,gtk+)
("gsound" ,gsound)
("geoclue" ,geoclue)
("geocode-glib" ,geocode-glib)
("libgweather" ,libgweather)
("gnome-desktop" ,gnome-desktop)))
(home-page "https://wiki.gnome.org/Apps/Clocks")
(synopsis "GNOME's clock application")
(description
"GNOME Clocks is a simple clocks application designed to fit the GNOME
desktop. It supports world clock, stop watch, alarms, and count down timer.")
(license license:gpl3+)))
(define-public gnome-calendar (define-public gnome-calendar
(package (package
(name "gnome-calendar") (name "gnome-calendar")
@ -5982,6 +6091,57 @@ Microsoft SkyDrive and Hotmail, using their REST protocols.")
desktop. It supports multiple calendars, monthly view and yearly view.") desktop. It supports multiple calendars, monthly view and yearly view.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public gnome-todo
(package
(name "gnome-todo")
(version "3.26.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"13if2lg4r65v3z7h5y57qv4iqz9ihjaml8bzvvihha7dffyr1lz4"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t
#:phases (modify-phases %standard-phases
(add-after
'install 'wrap-gnome-todo
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(python-path (getenv "PYTHONPATH")))
(wrap-program (string-append out "/bin/gnome-todo")
;; XXX: gi plugins are broken.
;; See https://bugzilla.gnome.org/show_bug.cgi?id=787212
;; For plugins.
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
`("PYTHONPATH" ":" prefix (,python-path))))
#t)))))
(native-inputs
`(("gettext" ,gettext-minimal)
("gobject-introspection" ,gobject-introspection)
("glib:bin" ,glib "bin") ; For glib-compile-resources
("gtk+-bin" ,gtk+ "bin") ; For gtk-update-icon-cache
("pkg-config" ,pkg-config)))
(inputs
`(("rest" ,rest) ; For Todoist plugin
("json-glib" ,json-glib) ; For Todoist plugin
("libical" ,libical)
("libpeas" ,libpeas)
("python-pygobject" ,python-pygobject)
("evolution-data-server" ,evolution-data-server)
("gnome-online-accounts" ,gnome-online-accounts)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
(home-page "https://wiki.gnome.org/Apps/Todo")
(synopsis "GNOME's ToDo Application")
(description
"GNOME To Do is a simplistic personal task manager designed to perfectly
fit the GNOME desktop.")
(license license:gpl3+)))
(define-public gnome-dictionary (define-public gnome-dictionary
(package (package
(name "gnome-dictionary") (name "gnome-dictionary")
@ -6066,7 +6226,7 @@ GNOME Shell appearance and extension, etc.")
(define-public gnome-shell-extensions (define-public gnome-shell-extensions
(package (package
(name "gnome-shell-extensions") (name "gnome-shell-extensions")
(version "3.24.2") (version "3.24.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -6074,7 +6234,7 @@ GNOME Shell appearance and extension, etc.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"10sg87wml5cmyk90pybnr6r942ba7173sl7yplhj2sfggp0wc74s")))) "0y8anpp9ymp0lxn15w63ra6zxxf8nvbl48xqkvqdjzida73fyz9w"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--enable-extensions=all"))) '(#:configure-flags '("--enable-extensions=all")))
@ -6422,7 +6582,7 @@ only know by its Unicode name or code point.")
(define-public bluefish (define-public bluefish
(package (package
(name "bluefish") (name "bluefish")
(version "2.2.9") (version "2.2.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -6430,7 +6590,7 @@ only know by its Unicode name or code point.")
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1vnl6raxbvc4hacg3pr6sqyjh707d304dhk5nyhlp7m0m1y3j756")))) "1jw4has7lbp77lqmzvnnjmqcf0lacjfnka873lkkwdyrpzc4c1q4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("desktop-file-utils" ,desktop-file-utils) `(("desktop-file-utils" ,desktop-file-utils)
@ -6754,3 +6914,92 @@ Lollypop plays audio formats such as mp3, mp4, ogg and flac and gets information
from artists and tracks from the web. It also fetches cover artworks from artists and tracks from the web. It also fetches cover artworks
automatically and it can stream songs from online music services and charts.") automatically and it can stream songs from online music services and charts.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public gnome-video-effects
(package
(name "gnome-video-effects")
(version "0.4.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/" name "-"
version ".tar.xz"))
(sha256
(base32
"06c2f1kihyhawap1s3zg5w7q7fypsybkp7xry4hxkdz4mpsy0zjs"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:out-of-source? #f))
(native-inputs
`(("glib:bin" ,glib "bin")
("intltool" ,intltool)
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
(home-page "https://wiki.gnome.org/Projects/GnomeVideoEffects")
(synopsis "Video effects for Cheese and other GNOME applications")
(description
"A collection of GStreamer video filters and effects to be used in
photo-booth-like software, such as Cheese.")
(license license:gpl2+)))
(define-public cheese
(package
(name "cheese")
(version "3.24.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/" name "-"
version ".tar.xz"))
(sha256
(base32
"0wpks2lnr8va9wxgmj26dwmhlcb3vamhpxkqi8xaan6q25635l16"))))
(arguments
;; Tests require GDK.
`(#:tests? #f
#:phases
(modify-phases %standard-phases
(add-before 'install 'skip-gtk-update-icon-cache
(lambda _
;; Don't create 'icon-theme.cache'
(substitute* "Makefile"
(("gtk-update-icon-cache") (which "true")))
#t))
(add-after 'install 'wrap-cheese
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
(wrap-program (string-append out "/bin/cheese")
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))
#t)))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("glib:bin" ,glib "bin")
("intltool" ,intltool)
("itstool" ,itstool)
("libxml2" ,libxml2)
("pkg-config" ,pkg-config)
("vala" ,vala)))
(propagated-inputs
`(("gnome-video-effects" ,gnome-video-effects)))
(inputs
`(("clutter" ,clutter)
("clutter-gst" ,clutter-gst)
("clutter-gtk" ,clutter-gtk)
("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib)
("gnome-desktop" ,gnome-desktop)
("gobject-introspection" ,gobject-introspection)
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-bad" ,gst-plugins-bad)
("gtk+" ,gtk+)
("libcanberra" ,libcanberra)
("libx11" ,libx11)
("libxtst" ,libxtst)))
(home-page "https://wiki.gnome.org/Apps/Cheese")
(synopsis "Webcam photo booth software for GNOME")
(description
"Cheese uses your webcam to take photos and videos. Cheese can also
apply fancy special effects and lets you share the fun with others.")
(license license:gpl2+)))

20
gnu/packages/gnunet.scm
View File

@ -155,7 +155,7 @@ tool to extract metadata from a file and print the results.")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("curl" ,curl) `(("curl" ,curl)
("gnutls" ,gnutls) ("gnutls" ,gnutls/dane)
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("openssl" ,openssl) ("openssl" ,openssl)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -186,24 +186,22 @@ and support for SSL3 and TLS.")
(define-public gnurl (define-public gnurl
(package (package
(name "gnurl") (name "gnurl")
(version "7.55.1-3") (version "7.55.1-4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://gnunet.org/sites/default/files/" (uri (string-append "https://gnunet.org/sites/default/files/"
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1p2qdh44hgsxjlzh4d3n51xr66cg2z517vpr818flvcrmpq2vxpq")))) "09c1bfwiwxqlh0dl839lslwhvkf98bvpyg9x4pcn3sagz0i8hxfl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ; 1.5 MiB of man3 pages "doc")) ; 1.5 MiB of man3 pages
(inputs `(("gnutls" ,gnutls) (inputs `(("gnutls" ,gnutls/dane)
("libidn" ,libidn) ("libidn" ,libidn)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("libtool" ,libtool)
("automake" ,automake)
("libtool" ,libtool)
("groff" ,groff) ("groff" ,groff)
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
@ -234,10 +232,6 @@ and support for SSL3 and TLS.")
(rename-file (string-append out "/share/man/man3") (rename-file (string-append out "/share/man/man3")
(string-append doc "/share/man/man3")) (string-append doc "/share/man/man3"))
#t))) #t)))
(add-before 'configure 'autoconf
;; Clear artifacts left (shebangs) from release preparation.
(lambda _
(zero? (system* "./buildconf"))))
(replace 'check (replace 'check
(lambda _ (lambda _
;; It is unclear why test1026 fails, however the content of it ;; It is unclear why test1026 fails, however the content of it
@ -277,7 +271,7 @@ supports HTTP, HTTPS and GnuTLS.")
("gnurl" ,gnurl) ("gnurl" ,gnurl)
("gstreamer" ,gstreamer) ("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base) ("gst-plugins-base" ,gst-plugins-base)
("gnutls" ,gnutls) ("gnutls" ,gnutls/dane)
("libextractor" ,libextractor) ("libextractor" ,libextractor)
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("libidn" ,libidn) ("libidn" ,libidn)
@ -345,7 +339,7 @@ kinds of basic applications for the foundation of a GNU internet.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
(add-before 'configure 'bootstrap (add-after 'unpack 'bootstrap
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vfi"))))))) (zero? (system* "autoreconf" "-vfi")))))))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)

161
gnu/packages/gnupg.scm
View File

@ -7,7 +7,7 @@
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2016 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2016 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2016 Mike Gerwitz <mtg@gnu.org> ;;; Copyright © 2016 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com> ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
@ -32,7 +32,10 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages adns) #:use-module (gnu packages adns)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages crypto)
#:use-module (gnu packages openldap) #:use-module (gnu packages openldap)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pth) #:use-module (gnu packages pth)
@ -53,6 +56,7 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)) #:use-module (guix build-system python))
(define-public libgpg-error (define-public libgpg-error
@ -81,6 +85,7 @@ Daemon and possibly more in the future.")
(define-public libgcrypt (define-public libgcrypt
(package (package
(replacement libgcrypt/fixed)
(name "libgcrypt") (name "libgcrypt")
(version "1.7.8") (version "1.7.8")
(source (origin (source (origin
@ -115,6 +120,18 @@ generation.")
(properties '((ftp-server . "ftp.gnupg.org") (properties '((ftp-server . "ftp.gnupg.org")
(ftp-directory . "/gcrypt/libgcrypt"))))) (ftp-directory . "/gcrypt/libgcrypt")))))
(define libgcrypt/fixed
(package
(inherit libgcrypt)
(version "1.8.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
version ".tar.bz2"))
(sha256
(base32
"1cvqd9jk5qshbh48yh3ixw4zyr4n5k50r3475rrh20xfn7w7aa3s"))))))
(define-public libassuan (define-public libassuan
(package (package
(name "libassuan") (name "libassuan")
@ -203,14 +220,14 @@ compatible to GNU Pth.")
(define-public gnupg (define-public gnupg
(package (package
(name "gnupg") (name "gnupg")
(version "2.1.23") (version "2.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0xqd5nm4j3w9lwk35vg57gl2i8bfkmx7d24i44gkbscm2lwpci59")))) "1yv2pwf3vhv9dpbf51fnm0wy03va1cg5r7qaz7rg75cwbgb0rmrl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -232,7 +249,8 @@ compatible to GNU Pth.")
`(#:configure-flags '(;; Otherwise, the test suite looks for the `gpg` `(#:configure-flags '(;; Otherwise, the test suite looks for the `gpg`
;; executable in its installation directory in ;; executable in its installation directory in
;; /gnu/store before it has been installed. ;; /gnu/store before it has been installed.
"--enable-gnupg-builddir-envvar") "--enable-gnupg-builddir-envvar"
"--enable-all-tests")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'patch-paths (add-before 'configure 'patch-paths
@ -249,26 +267,18 @@ compatible to GNU Pth.")
(string-append (getcwd) "/tests/gpgscm/gpgscm"))) (string-append (getcwd) "/tests/gpgscm/gpgscm")))
#t)) #t))
(add-before 'build 'patch-test-paths (add-before 'build 'patch-test-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda _
(let* ((coreutils (assoc-ref inputs "coreutils")) (substitute* '("tests/inittests"
(cat (string-append coreutils "/bin/cat")) "tests/pkits/inittests"
(pwd (string-append coreutils "/bin/pwd")) "tests/Makefile"
(true (string-append coreutils "/bin/true")) "tests/pkits/common.sh"
(false (string-append coreutils "/bin/false"))) "tests/pkits/Makefile")
(substitute* '("tests/inittests" (("/bin/pwd") (which "pwd")))
"tests/pkits/inittests" (substitute* "common/t-exectool.c"
"tests/Makefile" (("/bin/cat") (which "cat"))
"tests/pkits/common.sh" (("/bin/true") (which "true"))
"tests/pkits/Makefile" (("/bin/false") (which "false")))
) #t)))))
(("/bin/pwd") pwd))
(substitute* "common/t-exectool.c"
(("/bin/cat") cat))
(substitute* "common/t-exectool.c"
(("/bin/true") true))
(substitute* "common/t-exectool.c"
(("/bin/false") false))
#t))))))
(home-page "https://gnupg.org/") (home-page "https://gnupg.org/")
(synopsis "GNU Privacy Guard") (synopsis "GNU Privacy Guard")
(description (description
@ -529,6 +539,43 @@ and signature functionality from Python programs.")
(define-public python2-gnupg (define-public python2-gnupg
(package-with-python2 python-gnupg)) (package-with-python2 python-gnupg))
(define-public perl-gnupg-interface
(package
(name "perl-gnupg-interface")
(version "0.52")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-"
version
".tar.gz"))
(sha256
(base32
"0dgx8yhdsmhkazcrz14n4flrk1afv7azgl003hl4arxvi1d9yyi4"))))
(build-system perl-build-system)
(arguments
'(;; Result: FAIL
;; Failed 10/20 test programs. 21/52 subtests failed.
#:tests? #f))
(native-inputs
`(("perl-module-install" ,perl-module-install)
("which" ,which)))
(inputs
`(("gnupg" ,gnupg)))
(propagated-inputs
`(("perl-moo" ,perl-moo)
("perl-moox-late" ,perl-moox-late)
("perl-moox-handlesvia" ,perl-moox-handlesvia)))
(home-page "http://search.cpan.org/~alexmv/GnuPG-Interface/")
(synopsis "Perl interface to GnuPG")
(description
"@code{GnuPG::Interface} and its associated modules are designed to
provide an object-oriented method for interacting with GnuPG, being able to
perform functions such as but not limited to encrypting, signing, decryption,
verification, and key-listing parsing.")
(license license:perl-license)))
(define-public pius (define-public pius
(package (package
(name "pius") (name "pius")
@ -573,38 +620,48 @@ PGP keysigning parties.")
(define-public signing-party (define-public signing-party
(package (package
(name "signing-party") (name "signing-party")
(version "1.1.4") (version "2.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://debian/pool/main/s/signing-party/" (uri (string-append "mirror://debian/pool/main/s/signing-party/"
"signing-party_" version ".orig.tar.gz")) "signing-party_" version ".orig.tar.gz"))
(sha256 (base32 (sha256 (base32
"188gp0prbh8qs29lq3pbf0qibfd6jq4fk7i0pfrybl8aahvm84rx")))) "1n5bpcfpl9vg1xp6r1jhbyahrgdyxp05b5pria1rh4m0qnv8sifr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("perl" ,perl))) (native-inputs
`(("autoconf" ,(autoconf-wrapper))
("automake" ,automake)))
(inputs `(("perl" ,perl)
("perl-text-template" ,perl-text-template)
("perl-mime-tools" ,perl-mime-tools)
("perl-gnupg-interface" ,perl-gnupg-interface)
("perl-net-idn-encode" ,perl-net-idn-encode)
("libmd" ,libmd)))
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'remove-spurious-links (add-before 'configure 'change-directory
(lambda _ (delete-file "keyanalyze/pgpring/depcomp"))) (lambda _
;; The build system in the unpack phase changes to a less useful
;; subdirectory, so move up one level
(chdir (dirname (getcwd)))))
(replace 'configure (replace 'configure
(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* "keyanalyze/Makefile" (substitute* "keyanalyze/Makefile"
(("LDLIBS") (string-append "CC=" (which "gcc") "\nLDLIBS"))) (("LDLIBS") (string-append "CC=" (which "gcc") "\nLDLIBS")))
(substitute* "keyanalyze/Makefile" (substitute* "keyanalyze/Makefile"
(("./configure") (string-append "./configure --prefix=" out))) (("\\./configure") (string-append "./configure --prefix=" out)))
(substitute* "keyanalyze/pgpring/configure" (substitute* "gpgwrap/src/Makefile"
(("/bin/sh") (which "sh")))
(substitute* "gpgwrap/Makefile"
(("\\} clean") (("\\} clean")
(string-append "} clean\ninstall:\n\tinstall -D bin/gpgwrap " (string-append "} clean\ninstall:\n\tinstall -D bin/gpgwrap "
out "/bin/gpgwrap\n"))) out "/bin/gpgwrap\n")))
(substitute* '("gpgsigs/Makefile" "keyanalyze/Makefile" (substitute* '("gpgsigs/Makefile" "keyanalyze/Makefile"
"keylookup/Makefile" "sig2dot/Makefile" "keylookup/Makefile" "sig2dot/Makefile"
"springgraph/Makefile") "springgraph/Makefile")
(("/usr") out))))) (("/usr") out))
(setenv "CONFIG_SHELL" (which "sh")))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys #:rest args) (lambda* (#:key outputs #:allow-other-keys #:rest args)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
@ -629,7 +686,13 @@ PGP keysigning parties.")
'("caff.1" "pgp-clean.1" "pgp-fixkey.1" "gpgdir.1" '("caff.1" "pgp-clean.1" "pgp-fixkey.1" "gpgdir.1"
"gpg-key2ps.1" "gpglist.1" "gpg-mailkeys.1" "gpg-key2ps.1" "gpglist.1" "gpg-mailkeys.1"
"gpgparticipants.1" "gpgsigs.1" "gpgwrap.1" "gpgparticipants.1" "gpgsigs.1" "gpgwrap.1"
"process_keys.1" "pgpring.1" "keyanalyze.1")))))))) "process_keys.1" "pgpring.1" "keyanalyze.1")))))
(add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")))
(wrap-program
(string-append out "/bin/caff")
`("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))))))))
(synopsis "Collection of scripts for simplifying gnupg key signing") (synopsis "Collection of scripts for simplifying gnupg key signing")
(description (description
"Signing-party is a collection for all kinds of PGP/GnuPG related things, "Signing-party is a collection for all kinds of PGP/GnuPG related things,
@ -759,3 +822,31 @@ qualities. To reconstruct a secret key, you re-enter those
bytes (whether by hand, OCR, QR code, or the like) and paperkey can use bytes (whether by hand, OCR, QR code, or the like) and paperkey can use
them to transform your existing public key into a secret key.") them to transform your existing public key into a secret key.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public gpa
(package
(name "gpa")
(version "0.9.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/gpa/"
name "-" version ".tar.bz2"))
(sha256
(base32
"09xphbi2456qynwqq5n0yh0zdmdi2ggrj3wk4hsyh5lrzlvcrff3"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("gnupg" ,gnupg)
("gpgme" ,gpgme)
("libassuan" ,libassuan)
("libgpg-error" ,libgpg-error)
("gtk+-2" ,gtk+-2)))
(home-page "https://gnupg.org/software/gpa/")
(synopsis "Graphical user interface for GnuPG")
(description
"GPA, the GNU Privacy Assistant, is a graphical user interface for
@uref{https://gnupg.org, GnuPG}. It can be used to encrypt, decrypt, and sign
files, to verify signatures, and to manage the private and public keys.")
(license license:gpl3+)))

2
gnu/packages/gnustep.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

217
gnu/packages/gnuzilla.scm
View File

@ -249,7 +249,7 @@ in C/C++.")
(define-public nspr (define-public nspr
(package (package
(name "nspr") (name "nspr")
(version "4.16") (version "4.17")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -257,7 +257,7 @@ in C/C++.")
version "/src/nspr-" version ".tar.gz")) version "/src/nspr-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1l9wlnb9y0bzicv448jjl9kssqn044dc2qrkwzp4ll35fvch4ccv")))) "158hdn285dsb5rys8wl1wi32dd1axwhqq0r8fwny4aj157m0l2jr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)))
@ -281,7 +281,7 @@ in the Mozilla clients.")
(define-public nss (define-public nss
(package (package
(name "nss") (name "nss")
(version "3.32") (version "3.33")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (let ((version-with-underscores (uri (let ((version-with-underscores
@ -292,7 +292,7 @@ in the Mozilla clients.")
"nss-" version ".tar.gz"))) "nss-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"0dfkgvah0ji8b8lpxyy2w0b3lyz5ldmryii4z7j2bfwnrj0z7iim")) "1r44qa4j7sri50mxxbnrpm6fxprwrhv76whi7bfq73j06syxmw4q"))
;; Create nss.pc and nss-config. ;; Create nss.pc and nss-config.
(patches (search-patches "nss-pkgconfig.patch" (patches (search-patches "nss-pkgconfig.patch"
"nss-increase-test-timeout.patch")))) "nss-increase-test-timeout.patch"))))
@ -400,7 +400,7 @@ standards.")
(define-public icecat (define-public icecat
(package (package
(name "icecat") (name "icecat")
(version "52.1.0-gnu1") (version "52.3.0-gnu1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -409,186 +409,39 @@ standards.")
"/" name "-" version ".tar.bz2")) "/" name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1wr4bc5806xzyqpi6m4rjaf61za6ylpx4g0kfk95c6yw9yhg5vqb")) "00jki754d6310fxj1b7dbhqj69y5igck6gqg6rgfya243nsb56k9"))
(patches (patches
(list (list
(search-patch "icecat-avoid-bundled-libraries.patch") (search-patch "icecat-avoid-bundled-libraries.patch")
(mozilla-patch "icecat-bug-1342366.patch" "fb43f6690a26" "1vnkjpq2bcqwzmjkgyqv8wj0ndrrsyix3qy1rsb5is6pjmi9sbaa") (mozilla-patch "icecat-bug-546387.patch" "d13e3fefb76e" "1b760r0bg2ydbl585wlmajljh1nlisrwxvjws5b28a3sgjy01i6k")
(mozilla-patch "icecat-bug-1343818.patch" "90f870bbec29" "0mbki955f71n4yr9p0yc7kh5jwq7vs4bs4rhaazdncirbr564hm6") (mozilla-patch "icecat-bug-1350152.patch" "f822bda79c28" "1wf56169ca874shr6r7qx40s17h2gwj7ngmpyylrpmd1c6hipvsj")
(mozilla-patch "icecat-bug-1348454.patch" "c1cd8a02669f" "1wf0107763rw45kxkak7478vlax06ay7076cbm7ysxl7vijbr52w") (mozilla-patch "icecat-bug-1388166.patch" "fbb0bdb191d5" "1y8wpj38vw1dd6f375s9i0mrk9bd8z8gz5g70p4qynfllpkn072d")
(mozilla-patch "icecat-CVE-2017-5470-pt01.patch" "2553531f83b9" "0ibf59pa8czdyhc25sas6zhh2gf1k8vr8fklis2b1ms3n1qnzrha") (mozilla-patch "icecat-CVE-2017-7810-pt1.patch" "fbddb5cdd3c7" "0k5nyl2z1y2rx9fwqyfj64678yv6v3pnmshgk552pbzqmaf8i1hq")
(mozilla-patch "icecat-bug-1355873.patch" "9ee455ddcd68" "0d38hi4556635g9ag805vfyffdgfsp4a8v3d9ldffdp99ypv2ixj") (mozilla-patch "icecat-CVE-2017-7810-pt2.patch" "76c25987a275" "095b9vwsiza9ikbnnppfcld16h75x5bxjfxc73913y04n0i42ifh")
(mozilla-patch "icecat-CVE-2017-5470-pt02.patch" "6472c7006a73" "1fgydas23fzj49n4g43133bgjn98b2h38bii4knl7z7pm3fs2wws") (mozilla-patch "icecat-CVE-2017-7810-pt3.patch" "32eec29a85a5" "057simakqg56jvas1wkskg5kszn96m74nca26x08d5w7rzmbv1q2")
(mozilla-patch "icecat-CVE-2017-5470-pt03.patch" "0d5a26b29816" "03mkghl9i83jk1axr8bvw8la6shbggkabf23if8a9vi5jdv8182x") (mozilla-patch "icecat-bug-1373222.patch" "ecef71fa933f" "0vsymgy5j702lamvh2riahni7rdj9ba3bd6i4a2m22d638rwp1i2")
(mozilla-patch "icecat-bug-1357092.patch" "e78c943af07f" "0r830k6hja8z9rjk2nqjg8zfzr0wjcnic8rddh7jmc1inr1w3crm") (mozilla-patch "icecat-CVE-2017-7814.patch" "68a444daf85b" "1faaadaajidzb9i00710zxdyv370hlrdg1l5rw2ymfmzbjj4jqyd")
(mozilla-patch "icecat-CVE-2017-5470-pt04.patch" "d7c06f2d0d13" "1ahyns5v37w91bilvb3pa8kkdzkkn3fcxmi49jr5bycjlawljrm4") (mozilla-patch "icecat-bug-1376825.patch" "eeeec9cafc4e" "188qf6zi9kyxb33330yia6wmrd5mdyqn5hr1cl38zy7m3akv8srh")
(mozilla-patch "icecat-CVE-2017-5470-pt05.patch" "9071c7d4cc9c" "12128sf8s3zwv2w16kfl5jry9d6ky7hvps2006184rg23p32aj6n") (mozilla-patch "icecat-bug-1385272.patch" "d68fa12fbffc" "13gh97vz9n2b7303jcvr1072iy8bghy9chvbmxzvw82prvkscavw")
(mozilla-patch "icecat-bug-1336979.patch" "8bbc7b586d68" "0c13imyp1nq18in3yb1zcyi41b69svh4fn8msyj0c2lhbf8qnqcw") (mozilla-patch "icecat-bug-1390002.patch" "c24e6fc9f689" "0aswhy5fz2f6wzd5j5gg3nqvz707ip344089h2z2chcp146vxmf4")
(mozilla-patch "icecat-CVE-2017-5470-pt06.patch" "6d80ca63ff8b" "0s893fn6v0p323lcnl4cbkg1zd7gs1p0bw76ki6cmiapkn63gs13") (mozilla-patch "icecat-CVE-2017-7810-pt4.patch" "ae110cf77596" "0gdrkfq9wy9cfcdgbj14ci86xgh2prkbz69pfy97r9igd8059syw")
(mozilla-patch "icecat-CVE-2017-7752.patch" "43d7b98d8743" "1dhgy1jkvn3c4k27hbv8p16w7l09b8hd4w9zzpk8dpn4h78ncs3h") (mozilla-patch "icecat-CVE-2017-7810-pt5.patch" "b8417112486d" "1hya6lccz7vm51v4f6ww072794cwzmfn9xhxmvrnqbiyspxx5fz4")
(mozilla-patch "icecat-CVE-2017-5031.patch" "bd4fcdee9a06" "0xz1r342023a0bsllhjbzn6v75lpqznwacqyikb7q8i4hxkxh78a") (mozilla-patch "icecat-bug-1386905.patch" "badbf4308211" "0fj1pyjqfdsbrlfykwmkzav2nvdj1f4grwq3cal9f7ay6wjnfs9b")
(mozilla-patch "icecat-bug-1346499.patch" "747fd6c81983" "00iscyn4wr69205ppiaghlnd32845f5lcsl303v0fcdd4d1v04vc") (mozilla-patch "icecat-CVE-2017-7810-pt6.patch" "d78675515c78" "03w5hqy40xkckbaf5bm9kdbdqvp9ffvpk9mlrc9lja6b7qa4pjhg")
(mozilla-patch "icecat-bug-1334443-pt1.patch" "16201e8478df" "1k91xaai25vn1svkaldnsd2s8br3fgvnk5l54k3n3lk3m5vj55hv") (mozilla-patch "icecat-bug-1382303.patch" "f01155fe4d54" "0hnz1kvmvspg6453kydsklbvrjgzn8x3djvrym3f2xl2yinaf90d")
(mozilla-patch "icecat-bug-1334443-pt2.patch" "f100e5cf3bcb" "1cgbbbnkrd3ydfw99rhnpqdp5zq65537mg8sa1s9ajxkjjd1dkwj") (mozilla-patch "icecat-bug-1393467.patch" "4eec2a60622c" "1h006mwcsagq7mz7haymwgr7fn4zj14n5lxbjcmhdqrxdvma2hjj")
(mozilla-patch "icecat-bug-1354810.patch" "e579ef6e8d11" "0cmrh8dl85lzjxpbni08xbs8qq15sljnpg70a7rsl0jdbgih3mdx") (mozilla-patch "icecat-bug-1384801.patch" "9556e792f905" "0i74r807189s8i78483caiifw68cn7fs543i4cys6k3gn12dhhjy")
(mozilla-patch "icecat-bug-1356755.patch" "4a3fce67b52d" "126i9nwxsb3sjwb7dvhafacq86glnhx7r7jjv0h9v21s1w0kx4wj") (mozilla-patch "icecat-CVE-2017-7823.patch" "bd284765b5bc" "1c4hss87kc4qwx30magbqczm9h7zmwirjfc8zimqbrnwv9bbsfh3")
(mozilla-patch "icecat-CVE-2017-7765.patch" "7902fea300b8" "1jkrl8hdycsi17dd1m1vvl6gm1skhpf10q2m29zwfr8l40fd6a3q") (mozilla-patch "icecat-CVE-2017-7805.patch" "113da8d46aa4" "1vy0lw659mwixmb57mgybga152rdwqd5zj1g7nfw1zgp15pfwr75")
(mozilla-patch "icecat-bug-1353204.patch" "b5a21502aeff" "13rbrhvr37w95av9d4hkgi913nq0j6k2iijydylvprcn18cwibp0") (mozilla-patch "icecat-bug-1376399.patch" "58a574502ca9" "1zmg91pg0s5nwngc32a4fywidvxyaayvx1h052fsv0i4cfm16l9v")
(mozilla-patch "icecat-bug-1028195.patch" "69a5ca2bf867" "0q8cgi6837ikpg7gsvywmzhq0i102845apcbrd6mw0205qqsnw5c") (mozilla-patch "icecat-bug-1396570.patch" "24db61862c54" "0af1jjfma042xvn0xhgims1yvb2b51nhn4m0pcfwg3fn0llmka03")
(mozilla-patch "icecat-bug-1347835.patch" "bc635f45af37" "1fny422l6yc80901x6swybr8nk0in1wxfgy97ky4bdkcqlnmzpqv") (mozilla-patch "icecat-CVE-2017-7819.patch" "1a02f11c6efe" "18a9qvdvrqw34qw3lljg6gkn358jl23lyimhmbc964023rhs36sz")
(mozilla-patch "icecat-bug-1241066.patch" "b922ca70cce5" "09hcf9rm7ng3vj5y267w0c9h6pqinnz8gjlkwx1337xh43mdvqjv") (mozilla-patch "icecat-CVE-2017-7810-pt7.patch" "002686d9536f" "065g0d759wfiaj69b1sqg7l08p2knc0q9m9hvkgwwsf0r78xcbjj")
(mozilla-patch "icecat-CVE-2017-5470-pt07.patch" "1ce6d0652921" "163ji64a86h682frh1jq016w1mjf8g24r8cni0irsdmiihis7zxc") (mozilla-patch "icecat-CVE-2017-7810-pt8.patch" "eaadb31758d8" "0b3k3la6ykac5mbp9gyqqgjbmj19vx9sl1b0wp387qar0p12nyaz")
(mozilla-patch "icecat-bug-1324140.patch" "8886f9cd5dd3" "0byabs9md8r3pc4r67sv2759427n1za0gfayln40nx47n2p52kmg") (mozilla-patch "icecat-bug-1368269.patch" "0cff5e66e0f4" "0jb0wqi7c0ih4441s1908j6gv18v4inh7k2w47h3c9nhz4rgyrw7")
(mozilla-patch "icecat-CVE-2017-5470-pt08.patch" "ad995e90916b" "02nq9sg675p26z99nr2pykbz51hi2phf0gmrb1bjpq9pjbll7gsa") (mozilla-patch "icecat-CVE-2017-7793.patch" "6ff3c82962f0" "0bw82034kdmrpznigbavzzsiybzrw8giyf8v0z2cxf6mwl72bf9k")
(mozilla-patch "icecat-CVE-2017-7749.patch" "4ae71415fecf" "0yfkkdkkimad9a3w734xx85lb7hrl870c8k8an7w78fq3vl3fjnd") (mozilla-patch "icecat-bug-1400399.patch" "d6f78b1349b7" "0i3gwr2al3xl65yfa3nimvy8dp0jzpx21f6bjw18xwn7zkkh9j54")
(mozilla-patch "icecat-CVE-2017-7751.patch" "24cbb7f2e0ff" "006f0zhz5nxs72q9plwzhq4l79b47svzizvv510m5g2krsfrccza") (mozilla-patch "icecat-bug-1400721.patch" "285cde398833" "0a1i32zl30wfyw7zkqj595s94n6wdlg5c495m0910pd05pjg3qam")))
(mozilla-patch "icecat-CVE-2017-7750.patch" "89c7fb6c5be3" "19650nmc4vn1prbpn5h06kz9d1al279xkc23v39577h4zhdrknkj")
(mozilla-patch "icecat-bug-1337810.patch" "0f6dd3564c76" "1sxajqh6r7fjs45xhvjwg94smpvyvplh3rdvq11d3q5m9v4kg7mz")
(mozilla-patch "icecat-CVE-2017-5470-pt09.patch" "145905da25d3" "0c2q9f000snpm9x0qda2y0awrsm313iwxbv0kh33ca0kpza49a76")
(mozilla-patch "icecat-bug-1345355.patch" "c5012009a0b2" "0m772bgrwb8iwv2bdgx694ybg5wgbf58xg5v245x0p7gwhgwiwmr")
(mozilla-patch "icecat-bug-1351340.patch" "047f19a1b9a0" "0qjnhybibs3cpcba3ga4g7d4c0w716xa9jf87y2ir8yz7dw1f9vl")
(mozilla-patch "icecat-bug-1056322.patch" "f076a30f6c29" "0xgskjl6zmxi3v4l0f3wlas0qb2403fin5lv1hi3jf2142ihpaml")
(mozilla-patch "icecat-bug-1355414.patch" "28e09d4ac3e9" "06clr2kwz28nyjlj13y036x6rxwh6frdh11aq6kbm1nj6s01i9zl")
(mozilla-patch "icecat-bug-1313977.patch" "4c0b09f70aea" "04jq1xrlhj04n5bgh93xkbqwnh01pswfjhv81zk7i87c7xz6h92q")
(mozilla-patch "icecat-bug-1357366.patch" "0b855945ce34" "0va8kqlgx6qhq2qrawkcm66kqrwwpmxblyjp3c7ifplxd0j0ijaf")
(mozilla-patch "icecat-bug-1338574-pt0.patch" "243d7bffa4f1" "1d1v68amhnygc0g4w1afs374pjs7z5fx5inyq8idawbh4kxfncq7")
(mozilla-patch "icecat-bug-1338574-pt1.patch" "337398a83aa5" "1141n7dhy9rh70sww8v58cbkba74xm5i75j1sgm5qwvkhh69qr5h")
(mozilla-patch "icecat-bug-1338574-pt2.patch" "50e120d7ac64" "0dbcaq27vsjlh7vm30c88rlhkx8c1195rnr01six40mymh09rhym")
(mozilla-patch "icecat-bug-1338574-pt3.patch" "2d4da5a366e8" "1761npkpw5zsm4q8rzfrg8m1ayrf8c857iq3vdd8rbqcswzv6xq0")
(mozilla-patch "icecat-bug-1338574-pt4.patch" "b10d9b0c187f" "044zq9gzw4v5r3ki8dwfjg9dznai0jch29y0xrxzb2rfr6yvx0sb")
(mozilla-patch "icecat-bug-1338574-pt5.patch" "697713a6841c" "1m9q4rh4ny945xsx3p3f5bg1izs9q58d71la5drj31z6kvbhnsi2")
(mozilla-patch "icecat-bug-1338574-pt6.patch" "1d14abf37cf8" "1xyja9hjb7qfqi7kh85bw5nxkhyzw1rijjhnh5pgr5z0v718kjyc")
(mozilla-patch "icecat-bug-1338574-pt7.patch" "5e85bc599d0c" "1pmhs3hmhkgj6q19padcbpi5qvgnhx6ib09zpcwxr8ll6lllxhig")
(mozilla-patch "icecat-bug-1152353.patch" "d893dea8e7b4" "1pbayv7np6z7hlkk1dhvx3ppkni7f8n3cz8hs67l3nssw214c1ih")
(mozilla-patch "icecat-bug-1345893.patch" "3a747480ead1" "0sxd23y9g77mx5indjs9isxnnrkin835qrh6dn62dlvbll8lgqi2")
(mozilla-patch "icecat-bug-1343172.patch" "c7b064f6b93a" "1sh10j3h8cnqi3rpr70lv2yz14zhy1v9ms4f64fmrbjlz7q09j6q")
(mozilla-patch "icecat-bug-1352348.patch" "1d86e96610a1" "02ybn2608v57pjh8kjgnhkg157asawjk5xia59qb63m5vfvrinwv")
(mozilla-patch "icecat-bug-1354308.patch" "c8ba3f911eb1" "0w70b8dmvqjn1d8sphfkwnbwii8nh2q5k48clkvbhn7kpc2890mi")
(mozilla-patch "icecat-bug-1335904.patch" "366cdd623cfb" "0gcmld4bplaakx6d50gw223lg1jjcni7866q1f2hxm0h1r9wwd3k")
(mozilla-patch "icecat-bug-1355340.patch" "6b174b41fa44" "0zdgfy0zsrs3cvfkmrhxw0mrfibpnb58xp3z8fapx5ja59wmcabs")
(mozilla-patch "icecat-bug-1360574-pt1.patch" "237eee780619" "1iw6z762zdc42kwjvv58a2cjc0s4kzwwy7838apl7y7cq85g0jg2")
(mozilla-patch "icecat-bug-1360574-pt2.patch" "46a5a4aac189" "1i553f9qvav0fn5avbp8912995pqbhzbzamxxfz8gn2ik17y3xly")
(mozilla-patch "icecat-bug-1358776.patch" "bd35fa23f79a" "12nicgwhcn63knmlcl0c2askn9sj35bfclaab3826pkd9yq5g4p5")
(mozilla-patch "icecat-CVE-2017-5470-pt10.patch" "c1314a709b41" "0klgrcyc20fig6rbm9znjpcnfsz6xnlp1v03fbvaww0riy2qm42k")
(mozilla-patch "icecat-bug-1359859.patch" "e38948fb79d6" "1sfyc5s9ndv6q72k8n9x0rvj4sz40k51iljrs42gwykzkjm2fx5m")
(mozilla-patch "icecat-bug-1342057.patch" "278bef1d7a64" "0zk18s9pnbwz9ankmc9mj4197s55j1jvax04ansqymmmc3a5ciif")
(mozilla-patch "icecat-CVE-2017-5470-pt11.patch" "218e0963406f" "0wqms5nany4sx2g4p01lbam7la2dyazz87dhv5hcsf8ifxrfww11")
(mozilla-patch "icecat-bug-1304566.patch" "188e39630fcd" "1bfxfgj5ywx4bcf91kwyrjh5ppiv59gadx4445achyabdi639l8d")
(mozilla-patch "icecat-bug-1356601.patch" "8191e403fedf" "1k4zmq0923f5dc3dwbz1q0bkcbm90ldwkczym366hgwadb2305nd")
(mozilla-patch "icecat-bug-1334097.patch" "fe2a2c7e88cb" "1rppaivaddigwk65krn8m9f9mcdkiiv28ws9n9zj62n0rc1shyvc")
(mozilla-patch "icecat-bug-1359051.patch" "8d7dbe5c6587" "14zh74bbld4s0jy0a48fi9acxkc236mh9wjid3vrf72yj6bi5xnp")
(mozilla-patch "icecat-bug-1359697.patch" "ca2b5274549f" "1ns7v70i1hfkxqnjhf9fp0lk9095hdcllg94j3dl1nfaif4w6vbf")
(mozilla-patch "icecat-bug-1343256.patch" "a30dd7dd6617" "1k078176fp8vz871wirjz9d3yx9l2lfl8p75c4905n3j3zv2297q")
(mozilla-patch "icecat-CVE-2017-7778.patch" "81b3ce7d37b3" "0ad0wqczy4kpggj6m3b8bzxi6ax340mik1mfawhkq89a1h2sfpxv")
(mozilla-patch "icecat-bug-1356179.patch" "66d8893f37f0" "0izl31lagvdv4qpb9gkjxvgpmxzw50x5bviap4l7bbnb56cv7d8p")
(mozilla-patch "icecat-CVE-2017-5472.patch" "aad883966edd" "058axnrwrbvy2h9r9pb766lyky45hb92rap142sbp17yz0sxfmww")
(mozilla-patch "icecat-bug-1355520.patch" "7ca2d8839f7a" "1xbmpvr2x720x9ghd5wgbg6lknbnhcyqmkkfamdf97mqcyizyr21")
(mozilla-patch "icecat-bug-1358469.patch" "4d432638c0f9" "0qpjmwik3dryjwmgfwmkqk0rs9rb2lafb2k9fc3pkjnrq5y0l9xg")
(mozilla-patch "icecat-CVE-2017-5470-pt12.patch" "f5967db0a0f3" "045wbvkm21kbm314dd6lbq2disiaf26kmsxi6brf442fd0028gwq")
(mozilla-patch "icecat-bug-1345910.patch" "ec6b6720e54e" "0lm15jl46mdlsds6947jsiyvhf9agb8hcdrqj2svc3kn9kzvyr2n")
(mozilla-patch "icecat-CVE-2017-5470-pt13.patch" "a4f8d8a12afa" "0d7sjc21af074rvgvijj42gmpjvcb1v1zlpgb3s7ky7w6wjr35vx")
(mozilla-patch "icecat-CVE-2017-7754.patch" "d07f24a72ce4" "1qbwska76b2zslb95wnx9v04znb6k9fqylr4ajyfqpwk1sr363hg")
(mozilla-patch "icecat-CVE-2017-7764.patch" "a6caa7628e36" "1yv5f4h8js9bry9krcx130w6ic8rdmmq4fap6va24kfx8qflg70h")
(mozilla-patch "icecat-bug-1237868.patch" "41138235d4ea" "0mcj4x2kmagwf5hp8xhczf04sxm995pk1zarc9yffk84z7fcrxkj")
(mozilla-patch "icecat-bug-1331335.patch" "b724283e3b31" "1xbb1vcdzfpcmrmxm8ihwzslh2vz15k0k601nvyhh6vgx270h1wn")
(mozilla-patch "icecat-bug-1367267.patch" "4c2f4d8b693e" "1hrndhfnz0vnjnspwh5mbvgl2j8d1cs62awp04wx2w6z4l4wrmbv")
(mozilla-patch "icecat-CVE-2017-7756.patch" "cce3fd607206" "1z97jw8jpfyx61jxf0j8nsplnna2c5bwihwnl9cvlc2cspp3kgp5")
(mozilla-patch "icecat-CVE-2017-5470-pt14.patch" "dc4e3c64d781" "1zd666k4qpdamly3av09k602pmirjcs9l6la6ba0qq9w9vfan3g5")
(mozilla-patch "icecat-CVE-2017-5470-pt15.patch" "379c348250e8" "0kvsyhi9j3bjx14ffr13dslqp8ghcgrz6ds2fikdkrrrk4syskd5")
(mozilla-patch "icecat-bug-1349531.patch" "70cd711c6ae8" "07hlby5xdvqy6jdqxydv5pwap8hhsycb19fgw5fan2xf9dhrfpb8")
(mozilla-patch "icecat-CVE-2017-5470-pt16.patch" "6e644bc1a57f" "1xp8b74wijfz198q4hdybldnwh3hh0vh33dc5s7489abmz4s5zjg")
(mozilla-patch "icecat-CVE-2017-7758.patch" "279bffa85beb" "0shf77l9id6s8cs8xbc0ii0ccd7n09jv20410kkqqz11m296dcjr")
(mozilla-patch "icecat-CVE-2017-7757.patch" "0abcbc6ef8f3" "045arb1b83a3yv358naznl15bnr4wgxxayv8d5gcxarcbrrvm5q4")
(mozilla-patch "icecat-CVE-2017-5470-pt17.patch" "e0261afd69b9" "0a19b24iq57430kpbsdvka9vyg6kwhnnqis1xsd6wh8gz0bw5l79")
(mozilla-patch "icecat-CVE-2017-5470-pt18.patch" "4ec931d4bf29" "0bq0hq41xhy9aqjra5m0flmpilinlkb088r6w1kly561ckjl1f9f")
(mozilla-patch "icecat-bug-1339826-pt1.patch" "9c29579fffe2" "0yfc764qrynh441wwim18cr6k0sazgrm77frcdnyks0hzf0y44d1")
(mozilla-patch "icecat-bug-1339826-pt2.patch" "be946ea1a75a" "0pw0y1sdckn5brm39sdg47hbda5432aw32c3xq26ism23im85191")
(mozilla-patch "icecat-bug-1339826-pt2.patch" "44b2fe592a90" "1v8mz3b40dp6l5qrgha4yibmrnx80pxsvdll6ky1k937yhbzjk4a")
(mozilla-patch "icecat-CVE-2017-5470-pt19.patch" "f68e0d98a22a" "063z4a7gyhzy85fc2j2yr7kmk2zf7v875hjw4485civazydysw4j")
(mozilla-patch "icecat-bug-1353625.patch" "c41f37d913e2" "1s997c1hj4ywnlfbhvi1y96vd6bxl74wcrb0nly611h51h8xnyxm")
(mozilla-patch "icecat-CVE-2017-5470-pt20.patch" "38273203b827" "12p9r4spdp09d6ic9sqspvdr50lmc1p86ydz2fxdifb1f95njhx0")
(mozilla-patch "icecat-bug-1357022.patch" "5bd51bc3f587" "0z5drxpfjvb7s43qgcr404h8ckchgakwwwi4nxpx2i653w22a743")
(mozilla-patch "icecat-bug-1318845.patch" "512efd480dac" "13cmqap795ayh6gh3b5bc6002pz0wp92qngs7fh5qqklc7a0gkzv")
(mozilla-patch "icecat-CVE-2017-7798-pt1.patch" "d0c92199b9ed" "0qmsm7d4h6ysx3an247kpx9qpksfms7hrjgpdrghdbxla1hc4nc9")
(mozilla-patch "icecat-bug-1364513.patch" "88e9c2137640" "1mh4l745q1wlabn9sz47n0vy3h7c66fcay2b9dwa16iqwvh3lpiw")
(mozilla-patch "icecat-bug-1366203.patch" "08dd87b6bb8f" "15bfwfwwd978mlcpk1d6m7506k8c2y402md7wzf6piabxl5kk6cf")
(mozilla-patch "icecat-CVE-2017-7779-pt01.patch" "5a51a9ef8149" "0j0f9j0pryv3ik4bizhv8s6rr4dl1mjm01c23msayr0vbnpcagcs")
(mozilla-patch "icecat-CVE-2017-7779-pt02.patch" "f47eaebc0c5c" "1b52xm3awpigasaz0hk5b13l7v4ry9vrawf571lzy2wwhphs4nxx")
(mozilla-patch "icecat-CVE-2017-7779-pt03.patch" "40ce248a8c15" "1b722fiifr999ga0991cg5mlhidcnvf3zx2aiq5zjaabqn0f4dzk")
(mozilla-patch "icecat-CVE-2017-7798-pt2.patch" "0c8359ac6718" "1w0v2p5jnhzvcsx8h1bglwjhp5y5bg1g8pzpvjw7pg1wlq2frccr")
(mozilla-patch "icecat-CVE-2017-7779-pt04.patch" "8c27a68ee87e" "0kn05q8nvp26w5rnj8r0byw89h2awmwn04l9l3xv2i5w2a7zmjzf")
(mozilla-patch "icecat-CVE-2017-7779-pt05.patch" "b2ee0c5466da" "0jgwsppq0606lwg5jk9q69lqa14q3j7h3c7q6mxbz7zqrcg7d0zg")
(mozilla-patch "icecat-CVE-2017-7779-pt06.patch" "25f6ec16e501" "1yqd5ndwgd8x2pj9k2bnaq3rb1g7wikq0ii7l4dm6bqwabi2rdsg")
(mozilla-patch "icecat-CVE-2017-7779-pt07.patch" "30443b4f758e" "0riszl3xnpfq5ffywygrc12nsvx0ffd36d5rf4vp87r8lj3fr55r")
(mozilla-patch "icecat-CVE-2017-7779-pt08.patch" "1b934ab92c59" "114cvfzfxgkwwd4zpnrmm2kx6m94k0b3xcraba9aawwwhdxj6a1d")
(mozilla-patch "icecat-CVE-2017-7779-pt09.patch" "830a345dc0e7" "01riivv033w3mr8b2myaw38rz2za1bdlhybny737ly68hhc67xdz")
(mozilla-patch "icecat-CVE-2017-7786.patch" "5c26df489768" "1fdw4zbn0ilfghanxky4y7qcmkpkks2q1aqkzv26dnhhrr8350a1")
(mozilla-patch "icecat-CVE-2017-7791.patch" "f21e4d78a0a8" "0szsc3zm3wgrw8pxm0rz54whkrc14yy4d8vwmxgqsdns43qjgkpk")
(mozilla-patch "icecat-CVE-2017-7779-pt10.patch" "f19b6c6a0c6c" "0wkr010qnh4127z1j7fp45sqdk2da9x7j2k405r0x5bgqdd09qzp")
(mozilla-patch "icecat-CVE-2017-7784.patch" "8353a3fa4106" "0kzs8pl6spjwgdsmiw702zvbvz73ng9zf184clsfr82l8kmggbgw")
(mozilla-patch "icecat-bug-1371889.patch" "b38fed9a9772" "14vzsldlv4hjpxgnl6fjjbzhgcwsmd52v06cgmv0a7y3lnggj3hp"); XXX backed out upstream
(mozilla-patch "icecat-CVE-2017-7787.patch" "c254d3cc826c" "0pixwr18qik87c8qf4irg6hdffd8rbwpng73jxg05h7s827nfw3g")
(mozilla-patch "icecat-CVE-2017-7792.patch" "6356dbf20658" "0a0hsxkik7ysfa48w8k21lidaabwpmxi1d3214r5zqkqqfhn9qjm")
(mozilla-patch "icecat-bug-1358073.patch" "8d6e685d061b" "0430gwg7zzbg0q9w2m04s5ljh47bc8x1gxvmkzbn23bh1wy4d4sq")
(mozilla-patch "icecat-bug-1370869.patch" "3b8fde840188" "0vkymvzkfpzpg86npa5vpvvf564k18hkfdz8857rl0z4dp4rybzx")
(mozilla-patch "icecat-CVE-2017-7779-pt11.patch" "267b649087ff" "04wzazdm0kvbfcgmlhx8qs1ibqn8sbvqdsd237rja5wpr761xxf1")
(mozilla-patch "icecat-bug-1354796.patch" "69d1a9de76b9" "1q0p4kf8pvnkwwff3lz526pjj15a25pf724awblkcnzamwbib5ns")
(mozilla-patch "icecat-bug-1363027.patch" "c5eaa2d51b9f" "1xyj5n1vqhscc369q6wxibs2igbilaiwyc0q9cq64j2qx8q0yqah")
(mozilla-patch "icecat-bug-1364189.patch" "852a7781259e" "12y344p54avz5mrqirq14zp4csx8ydilnjv9nsw48kpa9y0l5xsg")
(mozilla-patch "icecat-bug-1342417.patch" "37ccdc5fff2b" "1acywg8girplbs7wjrjbvkximhiyizddmnkkq1ldd0l3qbx9nihc")
(mozilla-patch "icecat-CVE-2017-7779-pt12.patch" "057ed884ecb0" "1m49bqkq5lzc2j59wgwy0gbzvqj50p9lfn7cbc2n01v6d7m8rc2j")
(mozilla-patch "icecat-CVE-2017-7779-pt13.patch" "dd7ed649b82f" "1fama1l2vx4p6ahhrsrpysfbk9nh5gwbi4pdnclpyxd42idsdqxs")
(mozilla-patch "icecat-CVE-2017-7753.patch" "731958f7ff4d" "0l3i3mkb6rslnjag3caf4xyhjzxn91wfs0g6dbika4sxnhfs5d4i")
(mozilla-patch "icecat-bug-1364870.patch" "de8deecbcb02" "048ic1vk7fd7wxqjgjqlnb7kv03ynaa4wkrk0ka8m39pkjh3yyxj")
(mozilla-patch "icecat-bug-1365333.patch" "e3d13b270f45" "0jr8hpxpmfgrbh09xd9nj597cdnc6kl6gs5nir4zlzbbn8kp3429")
(mozilla-patch "icecat-bug-1372063.patch" "58a144bf9677" "12y8vikbzcfcfiidjdq67dvdhhvylx68wdgnypsafrd1q8dx9jza")
(mozilla-patch "icecat-bug-1373970.patch" "8321ef71adb5" "1wk8kq9n2vhqlinvvw01avv3c7qj0k3qnn7dj0whnl08a5yrqhpl")
(mozilla-patch "icecat-bug-1338646.patch" "322c18d011af" "1yqb7zmjz211ryb98pjj7axbj6bwkj63rmfyifsybdy3zpb4nf48")
(mozilla-patch "icecat-CVE-2017-7779-pt14.patch" "f9bc084fbb8a" "1ssml15yzx9s0wraq4n0xvq5bw7j8xq0p2y39h8j3f1c448n0j50")
(mozilla-patch "icecat-bug-1359477.patch" "9b70b5b852e4" "0z2bi7w46g7mm8msav8vz28mgvnv21z3a5876n9gpw317gns4d6a")
(mozilla-patch "icecat-CVE-2017-7779-pt15.patch" "6785c2a852da" "0p9jr171qi59scr5lrj6g0mv8mgm1i1wglr3jd16xywb0ymynnn5")
(mozilla-patch "icecat-CVE-2017-7779-pt16.patch" "11c8e23f0fd7" "0zcikv6dn7biii4gspv2kfvma5hc76hk86jahm3zl2zlkk8ikfm9")
(mozilla-patch "icecat-bug-1355168.patch" "f45ba43512ad" "0p28q5acns5zjj7ks2x5lrmwzzps741507sq31xvrpzan5yav37x")
(mozilla-patch "icecat-bug-1308820.patch" "e9a10fac6aae" "1s2zaka6ik1rmylamyh38vsqnqlblbqdhjpp0cv08fjb9flh5sbw")
(mozilla-patch "icecat-bug-1305036.patch" "c42a348f2ed0" "1pz7qbdv9xvyd1dy7g9h047c0gmrgp5qdy2360qjk6879n74h1zb")
(mozilla-patch "icecat-bug-1342913.patch" "f02db36497d2" "0g1kg418l1cibh5k1sjqj2vs2jcblpbn7b06qazk2kzcg70vf5gv")
(mozilla-patch "icecat-CVE-2017-7800.patch" "0a44ed156da5" "1y8z1czm7f91p9bpd32b9k43nl0b9g4fzwv4w0khby9y38xgvcbs")
(mozilla-patch "icecat-CVE-2017-7801.patch" "0a86729d653e" "0wyh7qskjwq9274d25p2ajylaab5mj5h8by58rz9lxsz06zrnz9f")
(mozilla-patch "icecat-CVE-2017-7779-pt17.patch" "98ff43fb228a" "0ih0nsmk8rzdrajzlnryqiqb71jg7v4p71hfla2hrlvn41r3709m")
(mozilla-patch "icecat-CVE-2017-7802.patch" "09f62bfc5800" "07q18qzxja1cywihr5vhhws328zghrwc6ldx8kcsawia1r1i5gp7")
(mozilla-patch "icecat-bug-1321803-pt1.patch" "cfb75012cfbd" "1bwwfm1vhr7ddsvmi1cinwdq6f4nd71fkd9lbnlhmh4ix63gz2yl")
(mozilla-patch "icecat-bug-1321803-pt2.patch" "0f3f951461d7" "1rp1cj4c0dkhd4pda88kx499h7ycw3037yh2khff78y61ckg2a85")
(mozilla-patch "icecat-bug-1321803-pt3.patch" "b654a39db998" "1v79mh8lrnn7q40c8zj24byrqyw3x8fwcw25w90wqajnbf0ixskx")
(mozilla-patch "icecat-bug-1334338.patch" "1be1fe3c9622" "1mhd9nyp8map76hgwrhm1k955fz8y5iszdvvgrv3z1r1h77k0nz0")
(mozilla-patch "icecat-bug-1379538.patch" "8fa66bc91b07" "1l44rwkdrv9y41nfb9h3fkykk3ci7xclp6rfwbbzm4293l00adrd")
(mozilla-patch "icecat-CVE-2017-7779-pt18.patch" "7c095249ef8a" "05dbvxlmh7jljjmis540nfgk2nn968prmxrm96674avn33989sqy")
(mozilla-patch "icecat-bug-1073952.patch" "06db7fb30689" "19qf9lrwy48fjzz3wpjfxsgqab68dnlci8jrwsljhpy6787xwxg2")
(mozilla-patch "icecat-CVE-2017-7803.patch" "c52d8ce8d5df" "03l9hk278b9mw75rxpn2ay1slyz21axa2l7dfxwkvj5vdn7ykdbj")
(mozilla-patch "icecat-CVE-2017-7779-pt19.patch" "d68c9edf056f" "0zfz0l9m675n4vvm87n8g3bdhhysla4qnywli5kwjy4krj9kq6qa")
(mozilla-patch "icecat-CVE-2017-7779-pt20.patch" "5dd82ab194b9" "10mdzwxibnmqs7y5arf8sjnva31i5vhbprlc63n74h8gh8k5kdlp")
(mozilla-patch "icecat-CVE-2017-7779-pt21.patch" "8fc70b2b57a8" "0yszfmb47x3rrzn5wncv112c1b7xw11j62adx4f7950fdj7zqr32")
(mozilla-patch "icecat-bug-1379444.patch" "47dd26630291" "0r2rc634sr4a5mfc53p1wx8d0zm6dsxiw2vzc7l89mac0d0cmi5n")
(mozilla-patch "icecat-bug-1372467.patch" "0f906e04a41d" "0f2zdpnb23yg3v5f1ha24cmagcwa01kf2xz1l2lcws4ss1w5b4a9")
(mozilla-patch "icecat-bug-1372383.patch" "56349462ff47" "17gc7kf0i367c1yh2w1701k8snvdm04nznc3q3yxdl3wxkh3c3sb")
(mozilla-patch "icecat-CVE-2017-7779-pt22.patch" "7b79969a18ee" "0ixycxbjh0wmihrhzpyjbkcnvwwrzs3ffb0lymzvqnr90yxvxhyy")
(mozilla-patch "icecat-CVE-2017-7779-pt23.patch" "f0ab032fd674" "04wc4i94cfj2vcawrv7hgbb70fkxggi7s6srk3i184686rczzpyw")
(mozilla-patch "icecat-bug-1308908.patch" "48a89721d076" "01gvdzy6whp2dqmjvx49f4mvl75dhjgr8dvx71pg4sx3xmdbkzyq")
(mozilla-patch "icecat-bug-1347667.patch" "ef1d17821945" "0s6gaarnvnibgf9x0xqcymaqc63lnbh9fm2g33i8cpp1xjhmywcv")
(mozilla-patch "icecat-bug-1367128-pt1.patch" "5a0f69630b03" "1vqbwmy58qxwfaisq0dxvvbsd5w5i4yb691i78gw1dv7kgf523qy")
(mozilla-patch "icecat-bug-1367128-pt2.patch" "7db52eca97b2" "081p8izjxscylfs090c9mzlmfvpdfvg1qsf5rik30hvifcpxp6lq")
(mozilla-patch "icecat-bug-1367128-pt3.patch" "c448439eb5dc" "18gp7mg3zh9dxi1300mcm0zk67nlmvp5q50gnyc1v2sv0gs6fdfb")
(mozilla-patch "icecat-bug-1377016.patch" "319a986ae1f4" "1dlmrklkpx42c72pblpw1fi91dhqarqyl3ldnd4943x2hsy3am8k")
(mozilla-patch "icecat-bug-1342433.patch" "09f5bd33efb8" "0dky981ggyc0237mbbyy1chndk0aznkhw00d3lrafiyxsyk6vg3z")
(mozilla-patch "icecat-bug-1359058-pt1.patch" "7ccb26caa02f" "1q97f4qbwjnz6f3g5dcy2v0av9jgbaplaz9pnm5yqdc250f5bhjz")
(mozilla-patch "icecat-bug-1359058-pt2.patch" "a93c1a40f0d8" "0gafbwv2npdjqh41fpvzmzdw3kcw1b41gm3jg9biwqxxwnvqqmfj")
(mozilla-patch "icecat-bug-1382303-pt1.patch" "688c9284fb12" "1rqimwkh8krihabsx7x2awvxls8n9dm2bmbl133fnkp2sjya979w")
(mozilla-patch "icecat-bug-1382303-pt2.patch" "7f969ba7b6e8" "036n1yrmmb6gydxcgyps89g63kj1w2rihk1zsmk7yw3crln226ai")
(mozilla-patch "icecat-bug-1382303-pt3.patch" "7e7b4f104462" "0wkw72qqyql528hvssrqyq72f5csfxa5fgv5s903csh97vawfl7i")
(mozilla-patch "icecat-bug-1383000.patch" "ce65d0641c07" "08bxn3b8rgjhkvdndc7mrd0k1715wbpa5qaxhslxlgj6lpkgk0b1")
(mozilla-patch "icecat-CVE-2017-7807.patch" "a86c77d533ee" "0mzfxpyk4484dk3j1sgplakx39ya0jnp3plxvcmvlc47ry60yq93")
(mozilla-patch "icecat-bug-1346620.patch" "d71000abc9bf" "10d632nq5zbhndrsx2vpkl7jprlnas361n1yh9s9szn8k4mj01rf")
(mozilla-patch "icecat-bug-1381016.patch" "c74486f87dc3" "1l938a2lhrlqfhmgrpypx13v6jw08528m4gnllr2h5sk2x65czip")
(mozilla-patch "icecat-bug-1371657.patch" "20a1a6ad46d5" "17yn5dpymrymgdywah403fzw0p2y9bjkccg0h4d221i3pwns4bcz")))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

40
gnu/packages/graphics.scm
View File

@ -6,6 +6,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -28,6 +29,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system python)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
@ -70,14 +72,14 @@
(define-public blender (define-public blender
(package (package
(name "blender") (name "blender")
(version "2.78a") (version "2.79")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.blender.org/source/" (uri (string-append "https://download.blender.org/source/"
"blender-" version ".tar.gz")) "blender-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1byf1klrvm8fdw2libx7wldz2i6lblp9nih6y58ydh00paqi8jh1")))) "16f84mdzkmwjmqahjj64kbyk4kagdj4mcr8qjazs1952d7kh7pm9"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(;; Test files are very large and not included in the release tarball. `(;; Test files are very large and not included in the release tarball.
@ -134,7 +136,7 @@
("openal" ,openal) ("openal" ,openal)
("python" ,python-wrapper) ("python" ,python-wrapper)
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "http://blender.org/") (home-page "https://blender.org/")
(synopsis "3D graphics creation suite") (synopsis "3D graphics creation suite")
(description (description
"Blender is a 3D graphics creation suite. It supports the entirety of "Blender is a 3D graphics creation suite. It supports the entirety of
@ -654,3 +656,33 @@ and understanding different BRDFs (and other component functions).")
It supports sub-pixel resolutions and anti-aliasing. It is also library for It supports sub-pixel resolutions and anti-aliasing. It is also library for
rendering SVG graphics.") rendering SVG graphics.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public python-pastel
(package
(name "python-pastel")
(version "0.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pastel" version))
(sha256
(base32
"1hqbm934n5yjwn31aq8h7shrr0rcy326wrqfc856vyn0gr0sy21i"))))
(build-system python-build-system)
(native-inputs
`(("python-pytest" ,python-pytest)))
(home-page "https://github.com/sdispater/pastel")
(synopsis "Library to colorize strings in your terminal")
(description "Pastel is a simple library to help you colorize strings in
your terminal. It comes bundled with predefined styles:
@enumerate
@item info: green
@item comment: yellow
@item question: black on cyan
@item error: white on red
@end enumerate
")
(license license:expat)))
(define-public python2-pastel
(package-with-python2 python-pastel))

28
gnu/packages/gstreamer.scm
View File

@ -98,7 +98,7 @@ arrays of data.")
(define-public gstreamer (define-public gstreamer
(package (package
(name "gstreamer") (name "gstreamer")
(version "1.12.2") (version "1.12.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -107,7 +107,7 @@ arrays of data.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1fllz7n58lavyy4nh64xc7izd4ffhl12a2ff0yg4z67al8wkzplz")))) "0vi1g8rmmsnd630ds3jwv2iph46ll8y07fzf04mz15q88j9g926k"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
@ -146,7 +146,7 @@ This package provides the core library and elements.")
(define-public gst-plugins-base (define-public gst-plugins-base
(package (package
(name "gst-plugins-base") (name "gst-plugins-base")
(version "1.12.2") (version "1.12.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -154,7 +154,7 @@ This package provides the core library and elements.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0x86a7aph0y6gyq178plvwvbbyhkfb3hf0gadx9sk5z1mzixqrsh")))) "19ffwdch7m777ragmwpy6prqmfb742ym1n3ki40s0zyki627plyk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(propagated-inputs (propagated-inputs
@ -201,7 +201,7 @@ for the GStreamer multimedia library.")
(define-public gst-plugins-good (define-public gst-plugins-good
(package (package
(name "gst-plugins-good") (name "gst-plugins-good")
(version "1.12.2") (version "1.12.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -210,7 +210,7 @@ for the GStreamer multimedia library.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"15pfw54fsh9s9xwrnbap4z4njwgqdfvq52k562d2hc5b11rfx4am")))) "00sznj1sl97fqpn6j8ngps04clvxp8h8yhw6lvszx4b855wz9rqk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("aalib" ,aalib) `(("aalib" ,aalib)
@ -260,14 +260,14 @@ developers consider to have good quality code and correct functionality.")
(define-public gst-plugins-bad (define-public gst-plugins-bad
(package (package
(name "gst-plugins-bad") (name "gst-plugins-bad")
(version "1.12.2") (version "1.12.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://gstreamer.freedesktop.org/src/" (uri (string-append "https://gstreamer.freedesktop.org/src/"
name "/" name "-" version ".tar.xz")) name "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0dwyq03g2m0p16dwx8q5qvjn5x9ia72h21sf87mp97gmwkfpwb4w")))) "1v5z3i5ha20gmbb3r9dwsaaspv5fm1jfzlzwlzqx1gjj31v5kl1n"))))
(outputs '("out" "doc")) (outputs '("out" "doc"))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -345,7 +345,7 @@ par compared to the rest.")
(define-public gst-plugins-ugly (define-public gst-plugins-ugly
(package (package
(name "gst-plugins-ugly") (name "gst-plugins-ugly")
(version "1.12.2") (version "1.12.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -353,7 +353,7 @@ par compared to the rest.")
name "/" name "-" version ".tar.xz")) name "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0rplyp1qk359c97ig9i2vc1v34g92khd8dslwfipva1ypwmr9hqw")))) "0lh00rg26iy5lr5al23lxsyncjqkgzph1bzkrgp8x9sfr62ab378"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gst-plugins-base" ,gst-plugins-base) `(("gst-plugins-base" ,gst-plugins-base)
@ -384,7 +384,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
(define-public gst-libav (define-public gst-libav
(package (package
(name "gst-libav") (name "gst-libav")
(version "1.12.2") (version "1.12.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -392,7 +392,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1crdahkjm23byg1awcrjkmgfbalfpvvac7h7whm6b2r1pfwkbdsv")))) "0l4nc6ikdx49l7bdrk3bd9p3pzry8a328r22zg48gyzpnv5ghph1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--with-system-libav") '(#:configure-flags '("--with-system-libav")
@ -422,7 +422,7 @@ compression formats through the use of the libav library.")
(define-public python-gst (define-public python-gst
(package (package
(name "python-gst") (name "python-gst")
(version "1.12.2") (version "1.12.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -430,7 +430,7 @@ compression formats through the use of the libav library.")
"gst-python-" version ".tar.xz")) "gst-python-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0iwy0v2k27wd3957ich6j5f0f04b0wb2mb175ypf2lx68snk5k7l")))) "19rb06x2m7103zwfm0plxx95gb8bp01ng04h4q9k6ii9q7g2kxf3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; XXX: Factorize python-sitedir with python-build-system. ;; XXX: Factorize python-sitedir with python-build-system.

30
gnu/packages/gtk.scm
View File

@ -11,7 +11,7 @@
;;; Coypright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Coypright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de> ;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 Patrick Hetu <patrick.hetu@auf.org> ;;; Copyright © 2016 Patrick Hetu <patrick.hetu@auf.org>
;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;; Coypright © 2017 Roel Janssen <roel@gnu.org> ;;; Coypright © 2017 Roel Janssen <roel@gnu.org>
@ -379,7 +379,7 @@ printing and other features typical of a source code editor.")
(define-public gtksourceview (define-public gtksourceview
(package (package
(name "gtksourceview") (name "gtksourceview")
(version "3.24.2") (version "3.24.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -387,7 +387,7 @@ printing and other features typical of a source code editor.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"17xqrnh2v9gba57ij2m9kngxwh19fzsqkx1rfasnv4zaqvqqhv69")))) "14x738xrz9q8qz13xd7dys748ryxyq2srbqyaa9r7n47h2av2zr0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -427,6 +427,7 @@ highlighting and other features typical of a source code editor.")
(define-public gdk-pixbuf (define-public gdk-pixbuf
(package (package
(name "gdk-pixbuf") (name "gdk-pixbuf")
(replacement gdk-pixbuf-2.36.10)
(version "2.36.6") (version "2.36.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -483,6 +484,7 @@ in the GNOME project.")
(define-public gdk-pixbuf+svg (define-public gdk-pixbuf+svg
(package (inherit gdk-pixbuf) (package (inherit gdk-pixbuf)
(name "gdk-pixbuf+svg") (name "gdk-pixbuf+svg")
(replacement gdk-pixbuf+svg-2.36.10)
(inputs (inputs
`(("librsvg" ,librsvg) `(("librsvg" ,librsvg)
,@(package-inputs gdk-pixbuf))) ,@(package-inputs gdk-pixbuf)))
@ -506,6 +508,26 @@ in the GNOME project.")
(synopsis (synopsis
"GNOME image loading and manipulation library, with SVG support"))) "GNOME image loading and manipulation library, with SVG support")))
;; Graft replacement packages to fix these vulnerabilities.
;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-2862
;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-2870
;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-6311
(define-public gdk-pixbuf-2.36.10
(package (inherit gdk-pixbuf)
(version "2.36.A")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gdk-pixbuf/2.36/"
"gdk-pixbuf-2.36.10.tar.xz"))
(sha256
(base32
"1klsjkdbashd8yb8xjsc9ff3bz32n2id5s79nrrmqiw9df4zmxpq"))))))
(define-public gdk-pixbuf+svg-2.36.10
(package (inherit gdk-pixbuf+svg)
(version "2.36.A")
(source (origin (inherit (package-source gdk-pixbuf-2.36.10))))))
(define-public at-spi2-core (define-public at-spi2-core
(package (package
(name "at-spi2-core") (name "at-spi2-core")
@ -838,7 +860,7 @@ exceptions, macros, and a dynamic programming environment.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(add-before 'configure 'bootstrap (add-after 'unpack 'bootstrap
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vfi"))))))) (zero? (system* "autoreconf" "-vfi")))))))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)

16
gnu/packages/guile.scm
View File

@ -365,7 +365,7 @@ AM_SCM_LOG_FLAGS = --no-auto-compile -s")
;; reasons. It does not fail when run outside of Guix. ;; reasons. It does not fail when run outside of Guix.
(("tests/database.scm") "")) (("tests/database.scm") ""))
#t)) #t))
(add-before 'configure 'autogen (add-after 'fix-bug-22 'autogen
(lambda _ (lambda _
(zero? (system* "sh" "autogen.sh"))))))) (zero? (system* "sh" "autogen.sh")))))))
(inputs (inputs
@ -654,12 +654,12 @@ format is also supported.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
(add-before 'configure 'autoreconf (add-after 'unpack 'autoreconf
(lambda _ (lambda _
;; Repository comes with a broken symlink ;; Repository comes with a broken symlink
(delete-file "README") (delete-file "README")
(symlink "README.org" "README") (symlink "README.org" "README")
(zero? (system* "autoreconf" "-fi"))))))) (zero? (system* "autoreconf" "-fi")))))))
(native-inputs (native-inputs
`(("autoconf" ,(autoconf-wrapper)) `(("autoconf" ,(autoconf-wrapper))
("automake" ,automake) ("automake" ,automake)
@ -1126,7 +1126,7 @@ Guile's foreign function interface.")
("sqlite" ,sqlite))) ("sqlite" ,sqlite)))
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
(add-before 'configure 'autoreconf (add-after 'unpack 'autoreconf
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vfi")))) (zero? (system* "autoreconf" "-vfi"))))
(add-before 'build 'set-sqlite3-file-name (add-before 'build 'set-sqlite3-file-name

40
gnu/packages/haskell.scm
View File

@ -36,6 +36,7 @@
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages lisp)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
@ -56,6 +57,45 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (ice-9 regex)) #:use-module (ice-9 regex))
(define-public cl-yale-haskell
(let ((commit "85f94c72a16c5f70301dd8db04cde9de2d7dd270")
(revision "1"))
(package
(name "cl-yale-haskell")
(version (string-append "2.0.5-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "http://git.elephly.net/software/yale-haskell.git")
(commit commit)))
(file-name (string-append "yale-haskell-" commit "-checkout"))
(sha256
(base32
"0bal3m6ryrjamz5p93bhs9rp5msk8k7lpcqr44wd7xs9b9k8w74g"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
;; Stripping binaries leads to a broken executable lisp system image.
#:strip-binaries? #f
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda _
(setenv "PRELUDE" "./progs/prelude")
(setenv "HASKELL_LIBRARY" "./progs/lib")
(setenv "PRELUDEBIN" "./progs/prelude/clisp")
(setenv "HASKELLPROG" "./bin/clisp-haskell")
#t)))))
(inputs
`(("clisp" ,clisp)))
(home-page "http://git.elephly.net/software/yale-haskell.git")
(synopsis "Port of the Yale Haskell system to CLISP")
(description "This package provides the Yale Haskell system running on
top of CLISP.")
(license license:bsd-4))))
(define ghc-bootstrap-x86_64-7.8.4 (define ghc-bootstrap-x86_64-7.8.4
(origin (origin
(method url-fetch) (method url-fetch)

2
gnu/packages/hexedit.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.

20
gnu/packages/ibus.scm
View File

@ -135,7 +135,7 @@ may also simplify input method development.")
(define-public ibus-libpinyin (define-public ibus-libpinyin
(package (package
(name "ibus-libpinyin") (name "ibus-libpinyin")
(version "1.9.0") (version "1.9.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/libpinyin/" (uri (string-append "https://github.com/libpinyin/"
@ -143,15 +143,15 @@ may also simplify input method development.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0gly314z6zn2fv52jw0764k66ry97llk009bk1q1iwf6rr829v68")))) "0wpgs0m62l4zlis9f11b7xknhgnw2xw485nc2xrzk880s17pp1mr"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'autogen (add-after 'unpack 'autogen
(lambda _ (and (zero? (system* "intltoolize")) (lambda _ (and (zero? (system* "intltoolize"))
(zero? (system* "autoreconf" "-vif"))))) (zero? (system* "autoreconf" "-vif")))))
(add-after 'wrap-program 'wrap-with-additional-paths (add-after 'wrap-program 'wrap-with-additional-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'ibus-setup-libpinyin' runs with the correct ;; Make sure 'ibus-setup-libpinyin' runs with the correct
;; PYTHONPATH and GI_TYPELIB_PATH. ;; PYTHONPATH and GI_TYPELIB_PATH.
@ -170,8 +170,8 @@ may also simplify input method development.")
("libpinyin" ,libpinyin) ("libpinyin" ,libpinyin)
("bdb" ,bdb) ("bdb" ,bdb)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("python" ,python-2) ("python" ,python)
("pyxdg" ,python2-pyxdg) ("pyxdg" ,python-pyxdg)
("gtk+" ,gtk+))) ("gtk+" ,gtk+)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -190,7 +190,7 @@ ZhuYin (Bopomofo) input method based on libpinyin for IBus.")
(define-public libpinyin (define-public libpinyin
(package (package
(name "libpinyin") (name "libpinyin")
(version "2.0.0") (version "2.1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -199,7 +199,7 @@ ZhuYin (Bopomofo) input method based on libpinyin for IBus.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"17fibx9psrxfiznm4yw8klgbnh3ksyisx0pm1n59kxkrq61v8y0b")))) "1iijpin65cmgawfx7sfdw1anmabljva0af1f9gx8ad6b4slhvknn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

4
gnu/packages/image-viewers.scm
View File

@ -54,7 +54,7 @@
(define-public feh (define-public feh
(package (package
(name "feh") (name "feh")
(version "2.19.3") (version "2.20")
(home-page "https://feh.finalrewind.org/") (home-page "https://feh.finalrewind.org/")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -62,7 +62,7 @@
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1l3yvv0l0ggwlfyhk84p2g9mrqvzqrg1fgalf88kzppvb9jppjay")))) "02vhdv16nf4kjna4inpbfy4k3p40bhl7xpc4kh4xvily14146l2b"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-delete 'configure %standard-phases) '(#:phases (alist-delete 'configure %standard-phases)

15
gnu/packages/image.scm
View File

@ -13,7 +13,7 @@
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 ng0 <ng0@infotropique.org> ;;; Copyright © 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
@ -520,7 +520,12 @@ work.")
(sha256 (sha256
(base32 (base32
"0yvfghxwfm3dcqr9krkw63pcd76hzkknc3fh7bh11s8qlvjvrpbg")) "0yvfghxwfm3dcqr9krkw63pcd76hzkknc3fh7bh11s8qlvjvrpbg"))
(patches (search-patches "openjpeg-CVE-2017-12982.patch")))) (patches (search-patches "openjpeg-CVE-2017-12982.patch"
"openjpeg-CVE-2017-14040.patch"
"openjpeg-CVE-2017-14041.patch"
"openjpeg-CVE-2017-14151.patch"
"openjpeg-CVE-2017-14152.patch"
"openjpeg-CVE-2017-14164.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
;; Trying to run `$ make check' results in a no rule fault. ;; Trying to run `$ make check' results in a no rule fault.
@ -868,7 +873,7 @@ channels.")
version ".tar.gz"))) version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1hsdzlzgkipprqh93yj81mrckl2l7c2mn2i84691pallnjz5qqhc")))) "1yza317qxd8yshvqnay164imm0ks7cvij8y8j86p1gqi1153qpn7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:tests? #f)) ; no `check' target (arguments '(#:tests? #f)) ; no `check' target
(propagated-inputs (propagated-inputs
@ -929,7 +934,7 @@ convert, manipulate, filter and display a wide variety of image formats.")
(define-public jasper (define-public jasper
(package (package
(name "jasper") (name "jasper")
(version "2.0.13") (version "2.0.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/mdadams/jasper/archive/" (uri (string-append "https://github.com/mdadams/jasper/archive/"
@ -937,7 +942,7 @@ convert, manipulate, filter and display a wide variety of image formats.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"090cyqcvqp4y12nc57gvcbrk3ap1rnnixd4qj90sx0pw3fs1615m")))) "0yx9y5y0g6jv142vnqp50j3k8k5yqznz3smrblv192wgfbm6w9l5"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs `(("libjpeg" ,libjpeg))) (inputs `(("libjpeg" ,libjpeg)))
(synopsis "JPEG-2000 library") (synopsis "JPEG-2000 library")

14
gnu/packages/imagemagick.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -45,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.9-9") (version "6.9.9-15")
(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
"0p7jz55zry5r1lv34ymx536fqymvy3iwzwy0kvj53mlmsaad7vjr")))) "0bxgdc1qiyvag6a2iiqcbwp4ak0m1mzi9qhs51fbrvv6syy12m6c"))))
(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")
@ -177,9 +178,14 @@ script.")
(base32 (base32
"122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v")) "122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v"))
(patches (patches
(search-patches "graphicsmagick-CVE-2017-12935.patch" (search-patches "graphicsmagick-CVE-2017-11403+CVE-2017-14103.patch"
"graphicsmagick-CVE-2017-12935.patch"
"graphicsmagick-CVE-2017-12936.patch" "graphicsmagick-CVE-2017-12936.patch"
"graphicsmagick-CVE-2017-12937.patch")))) "graphicsmagick-CVE-2017-12937.patch"
"graphicsmagick-CVE-2017-13775.patch"
"graphicsmagick-CVE-2017-13776+CVE-2017-13777.patch"
"graphicsmagick-CVE-2017-14042.patch"
"graphicsmagick-CVE-2017-14165.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

57
gnu/packages/irc.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net> ;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net>
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 ng0 <ng0@libertad.pw> ;;; Copyright © 2016 ng0 <ng0@libertad.pw>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
@ -69,26 +69,33 @@
(patches (search-patches "quassel-fix-tls-check.patch")) (patches (search-patches "quassel-fix-tls-check.patch"))
(sha256 (sha256
(base32 (base32
"0ka456fb8ha3w7g74xlzfg6w4azxjjxgrhl4aqpbwg3lnd6fbr4k")))) "0ka456fb8ha3w7g74xlzfg6w4azxjjxgrhl4aqpbwg3lnd6fbr4k"))
(modules '((guix build utils)))
;; We don't want to install the bundles scripts
(snippet
'(begin
(delete-file-recursively "data/scripts")
(substitute* "data/CMakeLists.txt"
(("NOT WIN32") "WIN32"))))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
;; The three binaries are not mutually exlusive, and are all built ;; The three binaries are not mutually exlusive, and are all built
;; by default. ;; by default.
`(#:configure-flags '(;;"-DWANT_QTCLIENT=OFF" ; 5.0 MiB '(#:configure-flags '(;;"-DWANT_QTCLIENT=OFF" ; 5.2 MiB
;;"-DWANT_CORE=OFF" ; 2.3 MiB ;;"-DWANT_CORE=OFF" ; 2.4 MiB
;;"-DWANT_MONO=OFF" ; 6.3 MiB ;;"-DWANT_MONO=OFF" ; 6.4 MiB
"-DUSE_QT5=ON" ; default is qt4 "-DUSE_QT5=ON" ; default is qt4
"-DWITH_KDE=OFF" ; no to integration "-DWITH_KDE=OFF" ; no to kde integration ...
"-DWITH_OXYGEN=ON" ; on=embed icons "-DWITH_OXYGEN=ON" ; therefore we install bundled icons
"-DWITH_WEBKIT=OFF") ; qtwebkit isn't packaged "-DWITH_WEBKIT=OFF") ; qtwebkit isn't packaged
#:tests? #f)) ; no test target #:tests? #f)) ; no test target
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs
(inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)
("oxygen-icons" ,oxygen-icons) ("pkg-config" ,pkg-config)
("qca" ,qca) ("qttools" ,qttools)))
(inputs
`(("qca" ,qca)
("qtbase", qtbase) ("qtbase", qtbase)
("qttools" ,qttools)
("qtscript" ,qtscript) ("qtscript" ,qtscript)
("snorenotify" ,snorenotify) ("snorenotify" ,snorenotify)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -143,46 +150,32 @@ SILC and ICB protocols via plugins.")
(define-public weechat (define-public weechat
(package (package
(name "weechat") (name "weechat")
(version "1.9") (version "1.9.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://weechat.org/files/src/weechat-" (uri (string-append "https://weechat.org/files/src/weechat-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1zvxz98krq98y7jh3yrjbardg3yxp6y2031rvb7rp5ssk8lyp1fc")) "1z92hprvgp128svfbr25x8j9kd114j9929bzbqasrcd92v31z6f2"))
(patches (search-patches "weechat-python.patch")))) (patches (search-patches "weechat-python.patch"))))
(build-system gnu-build-system) (build-system cmake-build-system)
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)))
("file" ,file)
("autogen" ,autogen)
("automake" ,automake)
("libtool" ,libtool)))
(inputs `(("ncurses" ,ncurses) (inputs `(("ncurses" ,ncurses)
("diffutils" ,diffutils)
("gettext" ,gettext-minimal)
("libltdl" ,libltdl)
("libgcrypt" ,libgcrypt "out") ("libgcrypt" ,libgcrypt "out")
("zlib" ,zlib) ("zlib" ,zlib)
("aspell" ,aspell) ("aspell" ,aspell)
("curl" ,curl) ("curl" ,curl)
("gnutls" ,gnutls) ("gnutls" ,gnutls)
("guile" ,guile-2.0) ("guile" ,guile-2.0)
("openssl" ,openssl)
("cyrus-sasl" ,cyrus-sasl)
("lua" ,lua-5.1) ("lua" ,lua-5.1)
("python" ,python-2) ("python" ,python-2)
("perl" ,perl) ("perl" ,perl)
("tcl" ,tcl))) ("tcl" ,tcl)))
(arguments (arguments
`(#:configure-flags (list (string-append `(#:tests? #f ; tests require cpputime
"--with-tclconfig="
(assoc-ref %build-inputs "tcl") "/lib"))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'configure 'autogen
(lambda _
(zero? (system* "./autogen.sh"))))
(add-after 'install 'wrap (add-after 'install 'wrap
(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"))

30
gnu/packages/java.scm
View File

@ -685,7 +685,7 @@ the standard javac executable. The tool runs on JamVM instead of SableVM.")))
"--disable-gjdoc") "--disable-gjdoc")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'bootstrap (add-after 'unpack 'bootstrap
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vif")))) (zero? (system* "autoreconf" "-vif"))))
(add-after 'unpack 'remove-unsupported-annotations (add-after 'unpack 'remove-unsupported-annotations
@ -1628,6 +1628,10 @@ IcedTea build harness.")
(copy-recursively "openjdk.build/docs" doc) (copy-recursively "openjdk.build/docs" doc)
(copy-recursively "openjdk.build/images/j2re-image" jre) (copy-recursively "openjdk.build/images/j2re-image" jre)
(copy-recursively "openjdk.build/images/j2sdk-image" jdk) (copy-recursively "openjdk.build/images/j2sdk-image" jdk)
;; Install the nss.cfg file to JRE to enable SSL/TLS
;; support via NSS.
(copy-file (string-append jdk "/jre/lib/security/nss.cfg")
(string-append jre "/lib/security/nss.cfg"))
#t))))))) #t)))))))
(native-inputs (native-inputs
`(("jdk" ,icedtea-7 "jdk") `(("jdk" ,icedtea-7 "jdk")
@ -4171,12 +4175,26 @@ more efficient storage-wise than an uncompressed bitmap (as implemented in the
#t)))) #t))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
;; FIXME: org.slf4j.NoBindingTest fails with the ominous "This code `(#:jar-name "slf4j-api.jar"
;; should have never made it into slf4j-api.jar".
`(#:tests? #f
#:jar-name "slf4j-api.jar"
#:source-dir "slf4j-api/src/main" #:source-dir "slf4j-api/src/main"
#:test-dir "slf4j-api/src/test")) #:test-dir "slf4j-api/src/test"
#:phases
(modify-phases %standard-phases
(add-after 'build 'regenerate-jar
(lambda _
;; pom.xml ignores these files in the jar creation process. If we don't,
;; we get the error "This code should have never made it into slf4j-api.jar"
(delete-file-recursively "build/classes/org/slf4j/impl")
(zero? (system* "jar" "-cf" "build/jar/slf4j-api.jar" "-C"
"build/classes" "."))))
(add-before 'check 'dont-test-abstract-classes
(lambda _
;; abstract classes are not meant to be run with junit
(substitute* "build.xml"
(("<include name=\"\\*\\*/\\*Test.java\" />")
(string-append "<include name=\"**/*Test.java\" />"
"<exclude name=\"**/MultithreadedInitializationTest"
".java\" />"))))))))
(inputs (inputs
`(("java-junit" ,java-junit) `(("java-junit" ,java-junit)
("java-hamcrest-core" ,java-hamcrest-core))) ("java-hamcrest-core" ,java-hamcrest-core)))

12
gnu/packages/javascript.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -32,7 +33,7 @@
(define-public font-mathjax (define-public font-mathjax
(package (package
(name "font-mathjax") (name "font-mathjax")
(version "2.7.1") (version "2.7.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -42,7 +43,7 @@
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0sbib5lk0jrvbq6s72ag6ss3wjlz5wnk07ddxij1kp96yg3c1d1b")))) "1r72di4pg4i6pfhcskkxqmf1158m81ki6a7lbw6nz4zh7xw23hy4"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments (arguments
`(#:modules ((guix build utils)) `(#:modules ((guix build utils))
@ -59,7 +60,8 @@
(mkdir-p install-directory) (mkdir-p install-directory)
(zero? (system* "tar" "-C" install-directory "-xvf" (zero? (system* "tar" "-C" install-directory "-xvf"
(assoc-ref %build-inputs "source") (assoc-ref %build-inputs "source")
"MathJax-2.7.1/fonts" "--strip" "2")))))) ,(string-append "MathJax-" version "/fonts")
"--strip" "2"))))))
(native-inputs (native-inputs
`(("gzip" ,gzip) `(("gzip" ,gzip)
("tar" ,tar))) ("tar" ,tar)))
@ -91,7 +93,9 @@
(setenv "LANG" "en_US.UTF-8") (setenv "LANG" "en_US.UTF-8")
(let ((install-directory (string-append %output "/share/javascript/mathjax"))) (let ((install-directory (string-append %output "/share/javascript/mathjax")))
(system* "tar" "xvf" (assoc-ref %build-inputs "source") (system* "tar" "xvf" (assoc-ref %build-inputs "source")
"MathJax-2.7.1/unpacked" "--strip" "2") ,(string-append "MathJax-" (package-version font-mathjax)
"/unpacked")
"--strip" "2")
(mkdir-p install-directory) (mkdir-p install-directory)
(symlink (string-append (assoc-ref %build-inputs "font-mathjax") (symlink (string-append (assoc-ref %build-inputs "font-mathjax")
"/share/fonts/mathjax") "/share/fonts/mathjax")

8
gnu/packages/jemalloc.scm
View File

@ -23,14 +23,13 @@
#:use-module ((guix licenses) #:select (bsd-2)) #:use-module ((guix licenses) #:select (bsd-2))
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (gnu packages base) #:use-module (gnu packages perl)
#:use-module (gnu packages gcc)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu))
(define-public jemalloc (define-public jemalloc
(package (package
(name "jemalloc") (name "jemalloc")
(version "4.5.0") (version "5.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -38,7 +37,7 @@
version "/jemalloc-" version ".tar.bz2")) version "/jemalloc-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl")))) "1sf3lzgb0y8nnyzmp4zrca3sngdxw3kfh20sna9z03jv74fph528"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -56,6 +55,7 @@
;; Transparent huge pages are only enabled by default on Intel processors ;; Transparent huge pages are only enabled by default on Intel processors
'() '()
'(#:configure-flags (list "--disable-thp"))))) '(#:configure-flags (list "--disable-thp")))))
(inputs `(("perl" ,perl)))
(home-page "http://jemalloc.net/") (home-page "http://jemalloc.net/")
(synopsis "General-purpose scalable concurrent malloc implementation") (synopsis "General-purpose scalable concurrent malloc implementation")
(description (description

26
gnu/packages/kde-frameworks.scm
View File

@ -29,6 +29,7 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages acl) #:use-module (gnu packages acl)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages aidc)
#:use-module (gnu packages attr) #:use-module (gnu packages attr)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
@ -1209,6 +1210,31 @@ querying and interacting with hardware independently of the underlying operating
system.") system.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public prison
(package
(name "prison")
(version "5.34.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/frameworks/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32 "00wj4yyfhhcq9b54civ5hy1grz70mmi676x50y12crcbbgkxm1lx"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("libdmtx", libdmtx)
("qrencode" ,qrencode)
("qtbase" ,qtbase))) ;; TODO: rethink: nix propagates this
(home-page "https://api.kde.org/frameworks/prison/html/index.html")
(synopsis "Barcode generation abstraction layer")
(description "Prison is a Qt-based barcode abstraction layer/library and
provides uniform access to generation of barcodes with data.")
(license license:lgpl2.1+)))
(define-public sonnet (define-public sonnet
(package (package
(name "sonnet") (name "sonnet")

8
gnu/packages/kde.scm
View File

@ -39,7 +39,7 @@
(define-public kdevelop (define-public kdevelop
(package (package
(name "kdevelop") (name "kdevelop")
(version "5.1.1") (version "5.1.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -48,7 +48,7 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0m6pnmylp1gij5cr75waz8hjry5894qillj5977h467hnbzs808a")))) "1iqaq0ilijjigqb34v5wq9in6bnjs0p9cmgbygjmy53xhh3yhm5g"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)
@ -151,7 +151,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
(define-public kdevplatform (define-public kdevplatform
(package (package
(name "kdevplatform") (name "kdevplatform")
(version "5.1.1") (version "5.1.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/kdevelop" (uri (string-append "mirror://kde/stable/kdevelop"
@ -159,7 +159,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"09p7lvniw55g6x8v8wl3azlps8c13yx03x1m9cd3qdxi282l8n9i")))) "0jk6g1kiqpyjy8pca0236b9944gxqnymqv8ny6m8nrraannxs8p6"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)

4
gnu/packages/ldc.scm
View File

@ -279,7 +279,7 @@ latest DMD frontend and uses LLVM as backend.")
(define-public dub (define-public dub
(package (package
(name "dub") (name "dub")
(version "1.4.1") (version "1.5.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/dlang/dub/archive/" (uri (string-append "https://github.com/dlang/dub/archive/"
@ -287,7 +287,7 @@ latest DMD frontend and uses LLVM as backend.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0hpl5srbrzwzv8abc96j4cgbmvm1zhr109ljbl7hrphzzc39zyan")))) "1p9pmzjsmd7v3jpilv0z0c8ar1ykvri6nn5fv95f8d2vriczj29m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; it would have tested itself by installing some packages (vibe etc) `(#:tests? #f ; it would have tested itself by installing some packages (vibe etc)

4
gnu/packages/libffcall.scm
View File

@ -27,7 +27,7 @@
(define-public libffcall (define-public libffcall
(package (package
(name "libffcall") (name "libffcall")
(version "1.13") (version "2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -35,7 +35,7 @@
"mirror://gnu/libffcall/libffcall-" version ".tar.gz")) "mirror://gnu/libffcall/libffcall-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1rxwkfr0p7vdv6q6x8nmn13611nsq0lnk9cspqdpzxdvgmqcw1qp")))) "0v0rh3vawb8z5q40fs3kr2f9zp06n2fq4rr2ww4562nr96sd5aj1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments `(#:parallel-build? #f)) (arguments `(#:parallel-build? #f))
(synopsis "Foreign function calls from interpreters") (synopsis "Foreign function calls from interpreters")

1
gnu/packages/libidn.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2012 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

86
gnu/packages/libreoffice.scm
View File

@ -6,6 +6,7 @@
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -24,12 +25,14 @@
(define-module (gnu packages libreoffice) (define-module (gnu packages libreoffice)
#: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) #:use-module ((guix licenses)
#:select (gpl2+ lgpl2.1+ lgpl3+ mpl1.1 mpl2.0 #:select (gpl2+ lgpl2.1+ lgpl3+ mpl1.1 mpl2.0
non-copyleft x11-style)) non-copyleft x11-style))
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (ice-9 match)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
@ -364,8 +367,8 @@ CorelDRAW documents of all versions.")
(arguments (arguments
`(#:configure-flags '("--with-mdds=1.2") `(#:configure-flags '("--with-mdds=1.2")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'configure 'autoreconf (add-after 'unpack 'autoreconf
(lambda _ (system* "autoreconf")))))) (lambda _ (system* "autoreconf"))))))
(native-inputs (native-inputs
`(("cppunit" ,cppunit) `(("cppunit" ,cppunit)
("doxygen" ,doxygen) ("doxygen" ,doxygen)
@ -719,6 +722,9 @@ Zoner Draw version 4 and 5.")
(add-after 'unpack 'bootstrap (add-after 'unpack 'bootstrap
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vfi"))))))) (zero? (system* "autoreconf" "-vfi")))))))
(native-search-paths (list (search-path-specification
(variable "DICPATH")
(files '("share/hunspell")))))
(home-page "https://hunspell.github.io/") (home-page "https://hunspell.github.io/")
(synopsis "Spell checker") (synopsis "Spell checker")
(description "Hunspell is a spell checker and morphological analyzer (description "Hunspell is a spell checker and morphological analyzer
@ -727,6 +733,78 @@ word compounding or character encoding.")
;; Triple license, including "mpl1.1 or later". ;; Triple license, including "mpl1.1 or later".
(license (list mpl1.1 gpl2+ lgpl2.1+)))) (license (list mpl1.1 gpl2+ lgpl2.1+))))
(define (dicollecte-french-dictionary variant synopsis)
;; Return a French dictionary package from dicollecte.org, for the given
;; VARIANT.
(package
(name (match variant
("classique" "hunspell-dict-fr")
(_ (string-append "hunspell-dict-fr-" variant))))
(version "6.1")
(source (origin
(uri (string-append
"http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v"
version ".zip"))
(method url-fetch)
(sha256
(base32
"0w2hzh36wj3lsj2yd4mh7z7547dg452sywj79vnzx27csclwqshc"))))
(build-system trivial-build-system)
(native-inputs `(("unzip" ,unzip)))
(arguments
`(#:modules ((guix build utils))
#:builder (begin
(use-modules (guix build utils)
(srfi srfi-26))
(let* ((out (assoc-ref %outputs "out"))
(hunspell (string-append out "/share/hunspell"))
(myspell (string-append out "/share/myspell"))
(doc (string-append out "/share/doc/"
,name))
(unzip (assoc-ref %build-inputs "unzip")))
(system* (string-append unzip "/bin/unzip")
(assoc-ref %build-inputs "source"))
(for-each (cut install-file <> hunspell)
(find-files "."
,(string-append variant
"\\.(dic|aff)$")))
(mkdir-p myspell)
(symlink hunspell (string-append myspell "/dicts"))
(for-each (cut install-file <> doc)
(find-files "." "\\.(txt|org|md)$"))
#t))))
(synopsis synopsis)
(description
"This package provides a dictionary for the Hunspell spell-checking
library.")
(home-page "https://www.dicollecte.org/home.php?prj=fr")
(license mpl2.0)))
(define-syntax define-french-dictionary
(syntax-rules (synopsis)
((_ name variant (synopsis text))
(define-public name
(dicollecte-french-dictionary variant text)))))
(define-french-dictionary hunspell-dict-fr-classique
"classique"
;; TRANSLATORS: In French, this is "Français classique".
(synopsis "Hunspell dictionary for ``classic'' French (recommended)"))
(define-french-dictionary hunspell-dict-fr-moderne
"moderne"
;; TRANSLATORS: In French, this is "Français moderne".
(synopsis "Hunspell dictionary for ``modern'' French"))
(define-french-dictionary hunspell-dict-fr-réforme-1990
"reforme1990"
(synopsis "Hunspell dictionary for the post @dfn{1990 réforme} French"))
(define-french-dictionary hunspell-dict-fr-toutes-variantes
"toutesvariantes"
(synopsis "Hunspell dictionary for all variants of French"))
(define-public hyphen (define-public hyphen
(package (package
(name "hyphen") (name "hyphen")
@ -789,7 +867,7 @@ and to return information on pronunciations, meanings and synonyms.")
(define-public libreoffice (define-public libreoffice
(package (package
(name "libreoffice") (name "libreoffice")
(version "5.3.5.2") (version "5.3.6.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -798,7 +876,7 @@ and to return information on pronunciations, meanings and synonyms.")
"http://download.documentfoundation.org/libreoffice/src/" "http://download.documentfoundation.org/libreoffice/src/"
(version-prefix version 3) "/libreoffice-" version ".tar.xz")) (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(sha256 (base32 (sha256 (base32
"1sknmb9bhm8mxyfycqbwng1jqs4avyp1ffcla7dhlpwqs1aqxvx5")))) "023a7hr7v5cf0ipga4ijhyl58ncgbjrp500qq5fwf65j8g2c3apz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(;; autoreconf is run by the LibreOffice build system, since after `(;; autoreconf is run by the LibreOffice build system, since after

8
gnu/packages/libunwind.scm
View File

@ -27,18 +27,18 @@
(define-public libunwind (define-public libunwind
(package (package
(name "libunwind") (name "libunwind")
(version "1.1") (version "1.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/libunwind/libunwind-" (uri (string-append "mirror://savannah/libunwind/libunwind-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx")) "1jsslwkilwrsj959dc8b479qildawz67r8m4lzxm7glcwa8cngiz"))))
(patches (search-patches "libunwind-CVE-2015-3239.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; FIXME: As of glibc 2.17, we get 3 out of 34 test failures. ;; FIXME: As of glibc 2.25, we get 1 out of 34 test failures (2 are
;; expected to fail).
;; Report them upstream. ;; Report them upstream.
'(#:tests? #f)) '(#:tests? #f))
(home-page "http://www.nongnu.org/libunwind") (home-page "http://www.nongnu.org/libunwind")

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