mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 13:28:12 -05:00
Merge branch 'master' into core-updates
This commit is contained in:
commit
aeafff536f
184 changed files with 8111 additions and 2376 deletions
|
@ -174,8 +174,8 @@ dist_noinst_DATA = guix/tests.scm
|
|||
|
||||
# Linux-Libre configurations.
|
||||
KCONFIGS = \
|
||||
gnu/packages/linux-libre-4.5-i686.conf \
|
||||
gnu/packages/linux-libre-4.5-x86_64.conf \
|
||||
gnu/packages/linux-libre-4.6-i686.conf \
|
||||
gnu/packages/linux-libre-4.6-x86_64.conf \
|
||||
gnu/packages/linux-libre-4.4-i686.conf \
|
||||
gnu/packages/linux-libre-4.4-x86_64.conf \
|
||||
gnu/packages/linux-libre-4.1-i686.conf \
|
||||
|
@ -248,6 +248,7 @@ SCM_TESTS = \
|
|||
tests/profiles.scm \
|
||||
tests/syscalls.scm \
|
||||
tests/gremlin.scm \
|
||||
tests/bournish.scm \
|
||||
tests/lint.scm \
|
||||
tests/publish.scm \
|
||||
tests/scripts.scm \
|
||||
|
|
114
doc/guix.texi
114
doc/guix.texi
|
@ -336,6 +336,13 @@ manager, which can be done on top of a running GNU/Linux system. If,
|
|||
instead, you want to install the complete GNU operating system,
|
||||
@pxref{System Installation}.
|
||||
|
||||
@cindex foreign distro
|
||||
When installed on a running GNU/Linux system---thereafter called a
|
||||
@dfn{foreign distro}---GNU@tie{}Guix complements the available tools
|
||||
without interference. Its data lives exclusively in two directories,
|
||||
usually @file{/gnu/store} and @file{/var/guix}; other files on your
|
||||
system, such as @file{/etc}, are left untouched.
|
||||
|
||||
@menu
|
||||
* Binary Installation:: Getting Guix running in no time!
|
||||
* Requirements:: Software needed to build and run Guix.
|
||||
|
@ -375,7 +382,7 @@ If that command fails because you do not have the required public key,
|
|||
then run this command to import it:
|
||||
|
||||
@example
|
||||
$ gpg --keyserver keys.gnupg.net --recv-keys 090B11993D9AEBB5
|
||||
$ gpg --keyserver pgp.mit.edu --recv-keys 090B11993D9AEBB5
|
||||
@end example
|
||||
|
||||
@noindent
|
||||
|
@ -998,6 +1005,10 @@ consecutive build results are not bit-for-bit identical. Note that this
|
|||
setting can be overridden by clients such as @command{guix build}
|
||||
(@pxref{Invoking guix build}).
|
||||
|
||||
When used in conjunction with @option{--keep-failed}, the differing
|
||||
output is kept in the store, under @file{/gnu/store/@dots{}-check}.
|
||||
This makes it easy to look for differences between the two results.
|
||||
|
||||
@item --debug
|
||||
Produce debugging output.
|
||||
|
||||
|
@ -1092,6 +1103,7 @@ daemons on the same machine.
|
|||
@node Application Setup
|
||||
@section Application Setup
|
||||
|
||||
@cindex foreign distro
|
||||
When using Guix on top of GNU/Linux distribution other than GuixSD---a
|
||||
so-called @dfn{foreign distro}---a few additional steps are needed to
|
||||
get everything in place. Here are some of them.
|
||||
|
@ -3082,7 +3094,7 @@ Store Monad}).
|
|||
|
||||
@cindex derivations
|
||||
Low-level build actions and the environment in which they are performed
|
||||
are represented by @dfn{derivations}. A derivation contain the
|
||||
are represented by @dfn{derivations}. A derivation contains the
|
||||
following pieces of information:
|
||||
|
||||
@itemize
|
||||
|
@ -4332,6 +4344,10 @@ substitutes are genuine (@pxref{Substitutes}), or whether the build result
|
|||
of a package is deterministic. @xref{Invoking guix challenge}, for more
|
||||
background information and tools.
|
||||
|
||||
When used in conjunction with @option{--keep-failed}, the differing
|
||||
output is kept in the store, under @file{/gnu/store/@dots{}-check}.
|
||||
This makes it easy to look for differences between the two results.
|
||||
|
||||
@item --derivations
|
||||
@itemx -d
|
||||
Return the derivation paths, not the output paths, of the given
|
||||
|
@ -5058,6 +5074,24 @@ reports information based on the available substitutes
|
|||
(@pxref{Substitutes}). This makes it possible it to profile disk usage of
|
||||
store items that are not even on disk, only available remotely.
|
||||
|
||||
You can also specify several package names:
|
||||
|
||||
@example
|
||||
$ guix size coreutils grep sed bash
|
||||
store item total self
|
||||
/gnu/store/@dots{}-coreutils-8.24 77.8 13.8 13.4%
|
||||
/gnu/store/@dots{}-grep-2.22 73.1 0.8 0.8%
|
||||
/gnu/store/@dots{}-bash-4.3.42 72.3 4.7 4.6%
|
||||
/gnu/store/@dots{}-readline-6.3 67.6 1.2 1.2%
|
||||
@dots{}
|
||||
total: 102.3 MiB
|
||||
@end example
|
||||
|
||||
@noindent
|
||||
In this example we see that the combination of the four packages takes
|
||||
102.3@tie{}MiB in total, which is much less than the sum of each closure
|
||||
since they have a lot of dependencies in common.
|
||||
|
||||
The available options are:
|
||||
|
||||
@table @option
|
||||
|
@ -5948,6 +5982,11 @@ dependencies of your system configuration can be downloaded. See the
|
|||
``Networking'' section below.
|
||||
@end quotation
|
||||
|
||||
The installation system includes many common tools needed for this task.
|
||||
But it is also a full-blown GuixSD system, which means that you can
|
||||
install additional packages, should you need it, using @command{guix
|
||||
package} (@pxref{Invoking guix package}).
|
||||
|
||||
@subsubsection Keyboard Layout
|
||||
|
||||
@cindex keyboard layout
|
||||
|
@ -5971,6 +6010,13 @@ Run the following command see what your network interfaces are called:
|
|||
ifconfig -a
|
||||
@end example
|
||||
|
||||
@noindent
|
||||
@dots{} or, using the GNU/Linux-specific @command{ip} command:
|
||||
|
||||
@example
|
||||
ip a
|
||||
@end example
|
||||
|
||||
@c http://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c#n20
|
||||
Wired interfaces have a name starting with @samp{e}; for example, the
|
||||
interface corresponding to the first on-board Ethernet controller is
|
||||
|
@ -7337,6 +7383,17 @@ Return a service that runs the Guix build daemon according to
|
|||
Run @var{udev}, which populates the @file{/dev} directory dynamically.
|
||||
@end deffn
|
||||
|
||||
@deffn {Scheme Procedure} urandom-seed-service @var{#f}
|
||||
Save some entropy in @var{%random-seed-file} to seed @file{/dev/urandom}
|
||||
when rebooting.
|
||||
@end deffn
|
||||
|
||||
@defvr {Scheme Variable} %random-seed-file
|
||||
This is the name of the file where some random bytes are saved by
|
||||
@var{urandom-seed-service} to seed @file{/dev/urandom} when rebooting.
|
||||
It defaults to @file{/var/lib/random-seed}.
|
||||
@end defvr
|
||||
|
||||
@deffn {Scheme Procedure} console-keymap-service @var{files} ...
|
||||
@cindex keyboard layout
|
||||
Return a service to load console keymaps from @var{files} using
|
||||
|
@ -9338,6 +9395,55 @@ Finally, @var{extra-options} is a list of additional command-line options
|
|||
passed to @command{lircd}.
|
||||
@end deffn
|
||||
|
||||
@subsubsection Dictionary Services
|
||||
The @code{(gnu services dict)} module provides the following service:
|
||||
|
||||
@deffn {Scheme Procedure} dicod-service [#:config (dicod-configuration)]
|
||||
Return a service that runs the @command{dicod} daemon, an implementation
|
||||
of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual}).
|
||||
|
||||
The optional @var{config} argument specifies the configuration for
|
||||
@command{dicod}, which should be a @code{<dicod-configuration>} object, by
|
||||
default it serves the GNU Collaborative International Dictonary of English.
|
||||
|
||||
You can add @command{open localhost} to your @file{~/.dico} file to make
|
||||
@code{localhost} the default server for @command{dico} client
|
||||
(@pxref{Initialization File,,, dico, GNU Dico Manual}).
|
||||
@end deffn
|
||||
|
||||
@deftp {Data Type} dicod-configuration
|
||||
Data type representing the configuration of dicod.
|
||||
|
||||
@table @asis
|
||||
@item @code{dico} (default: @var{dico})
|
||||
Package object of the GNU Dico dictionary server.
|
||||
|
||||
@item @code{databases} (default: @var{(list %dicod-database:gcide)})
|
||||
List of @code{<dicod-database>} objects denoting dictionaries to be served.
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@deftp {Data Type} dicod-database
|
||||
Data type representing a dictionary database.
|
||||
|
||||
@table @asis
|
||||
@item @code{name}
|
||||
Name of the database, will be used in DICT commands.
|
||||
|
||||
@item @code{module}
|
||||
Name of the dicod module used by this database
|
||||
(@pxref{Modules,,, dico, GNU Dico Manual}).
|
||||
|
||||
@item @code{options}
|
||||
List of strings or gexps representing the arguments for the module handler
|
||||
(@pxref{Handlers,,, dico, GNU Dico Manual}).
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@defvr {Scheme Variable} %dicod-database:gcide
|
||||
A @code{<dicod-database>} object serving the GNU Collaborative International
|
||||
Dictonary of English using the @code{gcide} package.
|
||||
@end defvr
|
||||
|
||||
@node Setuid Programs
|
||||
@subsection Setuid Programs
|
||||
|
@ -11068,7 +11174,9 @@ packages with the corresponding names.
|
|||
|
||||
If a project already contains the word @code{python}, we drop this;
|
||||
for instance, the module python-dateutil is packaged under the names
|
||||
@code{python-dateutil} and @code{python2-dateutil}.
|
||||
@code{python-dateutil} and @code{python2-dateutil}. If the project name
|
||||
starts with @code{py} (e.g. @code{pytz}), we keep it and prefix it as
|
||||
described above.
|
||||
|
||||
|
||||
@node Perl Modules
|
||||
|
|
84
doc/local.mk
84
doc/local.mk
|
@ -20,49 +20,49 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
info_TEXINFOS = doc/guix.texi
|
||||
info_TEXINFOS = %D%/guix.texi
|
||||
|
||||
DOT_FILES = \
|
||||
doc/images/bootstrap-graph.dot \
|
||||
doc/images/bootstrap-packages.dot \
|
||||
doc/images/coreutils-graph.dot \
|
||||
doc/images/coreutils-bag-graph.dot \
|
||||
doc/images/service-graph.dot \
|
||||
doc/images/shepherd-graph.dot
|
||||
%D%/images/bootstrap-graph.dot \
|
||||
%D%/images/bootstrap-packages.dot \
|
||||
%D%/images/coreutils-graph.dot \
|
||||
%D%/images/coreutils-bag-graph.dot \
|
||||
%D%/images/service-graph.dot \
|
||||
%D%/images/shepherd-graph.dot
|
||||
|
||||
DOT_VECTOR_GRAPHICS = \
|
||||
$(DOT_FILES:%.dot=%.eps) \
|
||||
$(DOT_FILES:%.dot=%.pdf)
|
||||
|
||||
EXTRA_DIST += \
|
||||
doc/htmlxref.cnf \
|
||||
doc/contributing.texi \
|
||||
doc/emacs.texi \
|
||||
doc/fdl-1.3.texi \
|
||||
%D%/htmlxref.cnf \
|
||||
%D%/contributing.texi \
|
||||
%D%/emacs.texi \
|
||||
%D%/fdl-1.3.texi \
|
||||
$(DOT_FILES) \
|
||||
$(DOT_VECTOR_GRAPHICS) \
|
||||
doc/images/coreutils-size-map.eps \
|
||||
doc/environment-gdb.scm \
|
||||
doc/package-hello.scm
|
||||
%D%/images/coreutils-size-map.eps \
|
||||
%D%/environment-gdb.scm \
|
||||
%D%/package-hello.scm
|
||||
|
||||
OS_CONFIG_EXAMPLES_TEXI = \
|
||||
doc/os-config-bare-bones.texi \
|
||||
doc/os-config-desktop.texi \
|
||||
doc/os-config-lightweight-desktop.texi
|
||||
%D%/os-config-bare-bones.texi \
|
||||
%D%/os-config-desktop.texi \
|
||||
%D%/os-config-lightweight-desktop.texi
|
||||
|
||||
# Bundle this file so that makeinfo finds it in out-of-source-tree builds.
|
||||
BUILT_SOURCES += $(OS_CONFIG_EXAMPLES_TEXI)
|
||||
EXTRA_DIST += $(OS_CONFIG_EXAMPLES_TEXI)
|
||||
MAINTAINERCLEANFILES = $(OS_CONFIG_EXAMPLES_TEXI)
|
||||
|
||||
doc/os-config-%.texi: gnu/system/examples/%.tmpl
|
||||
%D%/os-config-%.texi: gnu/system/examples/%.tmpl
|
||||
$(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \
|
||||
cp "$<" "$@"
|
||||
|
||||
infoimagedir = $(infodir)/images
|
||||
dist_infoimage_DATA = \
|
||||
$(DOT_FILES:%.dot=%.png) \
|
||||
doc/images/coreutils-size-map.png
|
||||
%D%/images/coreutils-size-map.png
|
||||
|
||||
# Try hard to obtain an image size and aspect that's reasonable for inclusion
|
||||
# in an Info or PDF document.
|
||||
|
@ -86,13 +86,13 @@ DOT_OPTIONS = \
|
|||
$(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
|
||||
mv "$@-tmp.eps" "$@"
|
||||
|
||||
# We cannot add new dependencies to `doc/guix.pdf' & co. (info "(automake)
|
||||
# We cannot add new dependencies to `%D%/guix.pdf' & co. (info "(automake)
|
||||
# Extending"). Using the `-local' rules is imperfect, because they may be
|
||||
# triggered after the main rule. Oh, well.
|
||||
pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf)
|
||||
info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png)
|
||||
ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps) \
|
||||
$(top_srcdir)/doc/images/coreutils-size-map.eps
|
||||
$(top_srcdir)/%D%/images/coreutils-size-map.eps
|
||||
dvi-local: ps-local
|
||||
|
||||
## ----------- ##
|
||||
|
@ -106,25 +106,25 @@ dvi-local: ps-local
|
|||
# They are built in $(srcdir) like info manuals.
|
||||
|
||||
sub_commands_mans = \
|
||||
$(srcdir)/doc/guix-archive.1 \
|
||||
$(srcdir)/doc/guix-build.1 \
|
||||
$(srcdir)/doc/guix-challenge.1 \
|
||||
$(srcdir)/doc/guix-download.1 \
|
||||
$(srcdir)/doc/guix-edit.1 \
|
||||
$(srcdir)/doc/guix-environment.1 \
|
||||
$(srcdir)/doc/guix-gc.1 \
|
||||
$(srcdir)/doc/guix-hash.1 \
|
||||
$(srcdir)/doc/guix-import.1 \
|
||||
$(srcdir)/doc/guix-lint.1 \
|
||||
$(srcdir)/doc/guix-package.1 \
|
||||
$(srcdir)/doc/guix-publish.1 \
|
||||
$(srcdir)/doc/guix-pull.1 \
|
||||
$(srcdir)/doc/guix-refresh.1 \
|
||||
$(srcdir)/doc/guix-size.1 \
|
||||
$(srcdir)/doc/guix-system.1
|
||||
$(srcdir)/%D%/guix-archive.1 \
|
||||
$(srcdir)/%D%/guix-build.1 \
|
||||
$(srcdir)/%D%/guix-challenge.1 \
|
||||
$(srcdir)/%D%/guix-download.1 \
|
||||
$(srcdir)/%D%/guix-edit.1 \
|
||||
$(srcdir)/%D%/guix-environment.1 \
|
||||
$(srcdir)/%D%/guix-gc.1 \
|
||||
$(srcdir)/%D%/guix-hash.1 \
|
||||
$(srcdir)/%D%/guix-import.1 \
|
||||
$(srcdir)/%D%/guix-lint.1 \
|
||||
$(srcdir)/%D%/guix-package.1 \
|
||||
$(srcdir)/%D%/guix-publish.1 \
|
||||
$(srcdir)/%D%/guix-pull.1 \
|
||||
$(srcdir)/%D%/guix-refresh.1 \
|
||||
$(srcdir)/%D%/guix-size.1 \
|
||||
$(srcdir)/%D%/guix-system.1
|
||||
|
||||
dist_man1_MANS = \
|
||||
$(srcdir)/doc/guix.1 \
|
||||
$(srcdir)/%D%/guix.1 \
|
||||
$(sub_commands_mans)
|
||||
|
||||
gen_man = \
|
||||
|
@ -133,14 +133,14 @@ gen_man = \
|
|||
|
||||
HELP2MANFLAGS = --source=GNU --info-page=$(PACKAGE_TARNAME)
|
||||
|
||||
$(srcdir)/doc/guix.1: scripts/guix.in $(sub_commands_mans)
|
||||
$(srcdir)/%D%/guix.1: scripts/guix.in $(sub_commands_mans)
|
||||
-$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1`
|
||||
|
||||
# The 'case' ensures the man pages are only generated if the corresponding
|
||||
# source script (the first prerequisite) has been changed. The $(GOBJECTS)
|
||||
# prerequisite is solely meant to force these docs to be made only after all
|
||||
# Guile modules have been compiled.
|
||||
$(srcdir)/doc/guix-%.1: guix/scripts/%.scm $(GOBJECTS)
|
||||
$(srcdir)/%D%/guix-%.1: guix/scripts/%.scm $(GOBJECTS)
|
||||
-@case '$?' in \
|
||||
*$<*) $(AM_V_P) && set -x || echo " HELP2MAN $@"; \
|
||||
$(gen_man) --output="$@" "guix $*";; \
|
||||
|
@ -149,9 +149,9 @@ $(srcdir)/doc/guix-%.1: guix/scripts/%.scm $(GOBJECTS)
|
|||
|
||||
if BUILD_DAEMON
|
||||
|
||||
dist_man1_MANS += $(srcdir)/doc/guix-daemon.1
|
||||
dist_man1_MANS += $(srcdir)/%D%/guix-daemon.1
|
||||
|
||||
$(srcdir)/doc/guix-daemon.1: nix/nix-daemon/guix-daemon.cc
|
||||
$(srcdir)/%D%/guix-daemon.1: nix/nix-daemon/guix-daemon.cc
|
||||
-$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1`
|
||||
|
||||
endif
|
||||
|
|
|
@ -207,6 +207,13 @@ Ask a user with PROMPT for continuing an operation."
|
|||
(guix-make-guile-expression
|
||||
'package-source-path package-id)))
|
||||
|
||||
(defun guix-package-store-path (package-id)
|
||||
"Return a list of store directories of outputs of package PACKAGE-ID."
|
||||
(message "Calculating the package derivation ...")
|
||||
(guix-eval-read
|
||||
(guix-make-guile-expression
|
||||
'package-store-path package-id)))
|
||||
|
||||
(defvar guix-after-source-download-hook nil
|
||||
"Hook run after successful performing a 'source-download' operation.")
|
||||
|
||||
|
@ -224,6 +231,20 @@ Ask a user with PROMPT for continuing an operation."
|
|||
:dry-run? (or guix-dry-run 'f))
|
||||
nil 'source-download)))
|
||||
|
||||
(defun guix-build-package (package-id &optional prompt)
|
||||
"Build package with PACKAGE-ID.
|
||||
Ask a user with PROMPT for continuing the build operation."
|
||||
(when (or (not guix-operation-confirm)
|
||||
(guix-operation-prompt (or prompt "Build package?")))
|
||||
(guix-eval-in-repl
|
||||
(format (concat ",run-in-store "
|
||||
"(build-package (package-by-id %d)"
|
||||
" #:use-substitutes? %s"
|
||||
" #:dry-run? %s)")
|
||||
package-id
|
||||
(guix-guile-boolean guix-use-substitutes)
|
||||
(guix-guile-boolean guix-dry-run)))))
|
||||
|
||||
;;;###autoload
|
||||
(defun guix-apply-manifest (profile file &optional operation-buffer)
|
||||
"Apply manifest from FILE to PROFILE.
|
||||
|
|
|
@ -51,6 +51,7 @@
|
|||
(guix licenses)
|
||||
(guix utils)
|
||||
(guix ui)
|
||||
(guix scripts)
|
||||
(guix scripts package)
|
||||
(gnu packages)
|
||||
(gnu system))
|
||||
|
@ -953,6 +954,17 @@ (define (package-location-string id-or-name)
|
|||
((package _ ...) package)))
|
||||
(compose location->string package-location)))
|
||||
|
||||
(define (package-store-path package-id)
|
||||
"Return a list of store directories of outputs of package PACKAGE-ID."
|
||||
(match (package-by-id package-id)
|
||||
(#f '())
|
||||
(package
|
||||
(with-store store
|
||||
(map (match-lambda
|
||||
((_ . drv)
|
||||
(derivation-output-path drv)))
|
||||
(derivation-outputs (package-derivation store package)))))))
|
||||
|
||||
(define (package-source-derivation->store-path derivation)
|
||||
"Return a store path of the package source DERIVATION."
|
||||
(match (derivation-outputs derivation)
|
||||
|
@ -988,6 +1000,16 @@ (define* (package-source-build-derivation package-id #:key dry-run?
|
|||
(format #t "The source store path: ~a~%"
|
||||
(package-source-derivation->store-path derivation))))))
|
||||
|
||||
(define (package-build-log-file package-id)
|
||||
"Return the build log file of a package PACKAGE-ID.
|
||||
Return #f if the build log is not found."
|
||||
(and-let* ((package (package-by-id package-id)))
|
||||
(with-store store
|
||||
(let* ((derivation (package-derivation store package))
|
||||
(file (derivation-file-name derivation)))
|
||||
(or (log-file store file)
|
||||
((@@ (guix scripts build) log-url) store file))))))
|
||||
|
||||
|
||||
;;; Executing guix commands
|
||||
|
||||
|
|
|
@ -111,6 +111,19 @@ is found and `guix-package-list-single' is nil."
|
|||
(list (if (= 0 package-id) package-id-str package-id)
|
||||
output))))
|
||||
|
||||
(defun guix-package-build-log-file (id)
|
||||
"Return build log file name of a package defined by ID."
|
||||
(guix-eval-read
|
||||
(guix-make-guile-expression 'package-build-log-file id)))
|
||||
|
||||
(defun guix-package-find-build-log (id)
|
||||
"Show build log of a package defined by ID."
|
||||
(require 'guix-build-log)
|
||||
(let ((file (guix-package-build-log-file id)))
|
||||
(if file
|
||||
(guix-build-log-find-file file)
|
||||
(message "Couldn't find the package build log."))))
|
||||
|
||||
|
||||
;;; Processing package actions
|
||||
|
||||
|
@ -222,6 +235,7 @@ ENTRIES is a list of package entries to get info about packages."
|
|||
(description ignore (simple guix-package-info-description))
|
||||
ignore
|
||||
(outputs simple guix-package-info-insert-outputs)
|
||||
guix-package-info-insert-misc
|
||||
(source simple guix-package-info-insert-source)
|
||||
(location simple guix-package-info-insert-location)
|
||||
(home-url format (format guix-url))
|
||||
|
@ -309,9 +323,15 @@ ENTRIES is a list of package entries to get info about packages."
|
|||
"Face used if a package is obsolete."
|
||||
:group 'guix-package-info-faces)
|
||||
|
||||
(defcustom guix-package-info-auto-find-package t
|
||||
"If non-nil, open store directory after pressing \"Show\" package button.
|
||||
If nil, just display the store directory (or directories) without finding."
|
||||
:type 'boolean
|
||||
:group 'guix-package-info)
|
||||
|
||||
(defcustom guix-package-info-auto-find-source nil
|
||||
"If non-nil, find a source file after pressing a \"Show\" button.
|
||||
If nil, just display the source file path without finding."
|
||||
"If non-nil, open source file after pressing \"Show\" source button.
|
||||
If nil, just display the source file name without finding."
|
||||
:type 'boolean
|
||||
:group 'guix-package-info)
|
||||
|
||||
|
@ -325,6 +345,14 @@ prompt depending on `guix-operation-confirm' variable)."
|
|||
:type 'boolean
|
||||
:group 'guix-package-info)
|
||||
|
||||
(defcustom guix-package-info-button-functions
|
||||
'(guix-package-info-insert-build-button
|
||||
guix-package-info-insert-build-log-button)
|
||||
"List of functions used to insert package buttons in Info buffer.
|
||||
Each function is called with 2 arguments: package ID and full name."
|
||||
:type '(repeat function)
|
||||
:group 'guix-package-info)
|
||||
|
||||
(defvar guix-package-info-download-buffer nil
|
||||
"Buffer from which a current download operation was performed.")
|
||||
|
||||
|
@ -521,6 +549,78 @@ ENTRY is an alist with package info."
|
|||
(guix-entry-id entry))
|
||||
'output output)))
|
||||
|
||||
(defun guix-package-info-show-store-path (entry-id package-id)
|
||||
"Show store directories of the package outputs in the current buffer.
|
||||
ENTRY-ID is an ID of the current entry (package or output).
|
||||
PACKAGE-ID is an ID of the package which store path to show."
|
||||
(let* ((entries (guix-buffer-current-entries))
|
||||
(entry (guix-entry-by-id entry-id entries))
|
||||
(dirs (guix-package-store-path package-id)))
|
||||
(or dirs
|
||||
(error "Couldn't define store directory of the package"))
|
||||
(let* ((new-entry (cons (cons 'store-path dirs)
|
||||
entry))
|
||||
(new-entries (guix-replace-entry entry-id new-entry entries)))
|
||||
(setf (guix-buffer-item-entries guix-buffer-item)
|
||||
new-entries)
|
||||
(guix-buffer-redisplay-goto-button)
|
||||
(let ((dir (car dirs)))
|
||||
(if (file-exists-p dir)
|
||||
(if guix-package-info-auto-find-package
|
||||
(find-file dir)
|
||||
(message nil))
|
||||
(message "'%s' does not exist.\nTry to build this package."
|
||||
dir))))))
|
||||
|
||||
(defun guix-package-info-insert-misc (entry)
|
||||
"Insert various buttons and other info for package ENTRY at point."
|
||||
(if (guix-entry-value entry 'obsolete)
|
||||
(guix-format-insert nil)
|
||||
(let* ((entry-id (guix-entry-id entry))
|
||||
(package-id (or (guix-entry-value entry 'package-id)
|
||||
entry-id))
|
||||
(full-name (guix-package-entry->name-specification entry))
|
||||
(store-path (guix-entry-value entry 'store-path)))
|
||||
(guix-info-insert-title-simple "Package")
|
||||
(if store-path
|
||||
(guix-info-insert-value-indent store-path 'guix-file)
|
||||
(guix-info-insert-action-button
|
||||
"Show"
|
||||
(lambda (btn)
|
||||
(guix-package-info-show-store-path
|
||||
(button-get btn 'entry-id)
|
||||
(button-get btn 'package-id)))
|
||||
"Show the store directory of the current package"
|
||||
'entry-id entry-id
|
||||
'package-id package-id))
|
||||
(when guix-package-info-button-functions
|
||||
(insert "\n")
|
||||
(guix-mapinsert (lambda (fun)
|
||||
(funcall fun package-id full-name))
|
||||
guix-package-info-button-functions
|
||||
(guix-info-get-indent)
|
||||
:indent guix-info-indent
|
||||
:column (guix-info-fill-column))))))
|
||||
|
||||
(defun guix-package-info-insert-build-button (id full-name)
|
||||
"Insert button to build a package defined by ID."
|
||||
(guix-info-insert-action-button
|
||||
"Build"
|
||||
(lambda (btn)
|
||||
(guix-build-package (button-get btn 'id)
|
||||
(format "Build '%s' package?" full-name)))
|
||||
(format "Build the current package")
|
||||
'id id))
|
||||
|
||||
(defun guix-package-info-insert-build-log-button (id _name)
|
||||
"Insert button to show build log of a package defined by ID."
|
||||
(guix-info-insert-action-button
|
||||
"Build Log"
|
||||
(lambda (btn)
|
||||
(guix-package-find-build-log (button-get btn 'id)))
|
||||
"View build log of the current package"
|
||||
'id id))
|
||||
|
||||
(defun guix-package-info-show-source (entry-id package-id)
|
||||
"Show file name of a package source in the current info buffer.
|
||||
Find the file if needed (see `guix-package-info-auto-find-source').
|
||||
|
@ -817,6 +917,7 @@ for all ARGS."
|
|||
(version format guix-output-info-insert-version)
|
||||
(output format guix-output-info-insert-output)
|
||||
(synopsis simple (indent guix-package-info-synopsis))
|
||||
guix-package-info-insert-misc
|
||||
(source simple guix-package-info-insert-source)
|
||||
(path simple (indent guix-file))
|
||||
(dependencies simple (indent guix-file))
|
||||
|
|
|
@ -84,16 +84,33 @@ If FORMAT is non-nil, format VAL with FORMAT."
|
|||
(format format str)
|
||||
str))))
|
||||
|
||||
(defun guix-mapinsert (function sequence separator)
|
||||
(cl-defun guix-mapinsert (function sequence separator &key indent column)
|
||||
"Like `mapconcat' but for inserting text.
|
||||
Apply FUNCTION to each element of SEQUENCE, and insert SEPARATOR
|
||||
at point between each FUNCTION call."
|
||||
(when sequence
|
||||
(funcall function (car sequence))
|
||||
(mapc (lambda (obj)
|
||||
at point between each FUNCTION call.
|
||||
|
||||
If INDENT is non-nil, it should be a number of spaces used to
|
||||
indent each line of the inserted text.
|
||||
|
||||
If COLUMN is non-nil, it should be a column number which
|
||||
shouldn't be exceeded by the inserted text."
|
||||
(pcase sequence
|
||||
(`(,first . ,rest)
|
||||
(let* ((indent (or indent 0))
|
||||
(max-column (and column (- column indent))))
|
||||
(guix-with-indent indent
|
||||
(funcall function first)
|
||||
(dolist (element rest)
|
||||
(let ((before-sep-pos (and column (point))))
|
||||
(insert separator)
|
||||
(funcall function obj))
|
||||
(cdr sequence))))
|
||||
(let ((after-sep-pos (and column (point))))
|
||||
(funcall function element)
|
||||
(when (and column
|
||||
(> (current-column) max-column))
|
||||
(save-excursion
|
||||
(delete-region before-sep-pos after-sep-pos)
|
||||
(goto-char before-sep-pos)
|
||||
(insert "\n")))))))))))
|
||||
|
||||
(defun guix-insert-button (label &optional type &rest properties)
|
||||
"Make button of TYPE with LABEL and insert it at point.
|
||||
|
|
|
@ -17,51 +17,51 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
AUTOLOADS = emacs/guix-autoloads.el
|
||||
AUTOLOADS = %D%/guix-autoloads.el
|
||||
|
||||
ELFILES = \
|
||||
emacs/guix-about.el \
|
||||
emacs/guix-backend.el \
|
||||
emacs/guix-base.el \
|
||||
emacs/guix-build-log.el \
|
||||
emacs/guix-buffer.el \
|
||||
emacs/guix-command.el \
|
||||
emacs/guix-devel.el \
|
||||
emacs/guix-emacs.el \
|
||||
emacs/guix-entry.el \
|
||||
emacs/guix-external.el \
|
||||
emacs/guix-geiser.el \
|
||||
emacs/guix-guile.el \
|
||||
emacs/guix-help-vars.el \
|
||||
emacs/guix-history.el \
|
||||
emacs/guix-hydra.el \
|
||||
emacs/guix-hydra-build.el \
|
||||
emacs/guix-hydra-jobset.el \
|
||||
emacs/guix-info.el \
|
||||
emacs/guix-init.el \
|
||||
emacs/guix-license.el \
|
||||
emacs/guix-list.el \
|
||||
emacs/guix-location.el \
|
||||
emacs/guix-messages.el \
|
||||
emacs/guix-pcomplete.el \
|
||||
emacs/guix-popup.el \
|
||||
emacs/guix-prettify.el \
|
||||
emacs/guix-profiles.el \
|
||||
emacs/guix-read.el \
|
||||
emacs/guix-ui.el \
|
||||
emacs/guix-ui-license.el \
|
||||
emacs/guix-ui-location.el \
|
||||
emacs/guix-ui-package.el \
|
||||
emacs/guix-ui-generation.el \
|
||||
emacs/guix-ui-system-generation.el \
|
||||
emacs/guix-utils.el
|
||||
%D%/guix-about.el \
|
||||
%D%/guix-backend.el \
|
||||
%D%/guix-base.el \
|
||||
%D%/guix-build-log.el \
|
||||
%D%/guix-buffer.el \
|
||||
%D%/guix-command.el \
|
||||
%D%/guix-devel.el \
|
||||
%D%/guix-emacs.el \
|
||||
%D%/guix-entry.el \
|
||||
%D%/guix-external.el \
|
||||
%D%/guix-geiser.el \
|
||||
%D%/guix-guile.el \
|
||||
%D%/guix-help-vars.el \
|
||||
%D%/guix-history.el \
|
||||
%D%/guix-hydra.el \
|
||||
%D%/guix-hydra-build.el \
|
||||
%D%/guix-hydra-jobset.el \
|
||||
%D%/guix-info.el \
|
||||
%D%/guix-init.el \
|
||||
%D%/guix-license.el \
|
||||
%D%/guix-list.el \
|
||||
%D%/guix-location.el \
|
||||
%D%/guix-messages.el \
|
||||
%D%/guix-pcomplete.el \
|
||||
%D%/guix-popup.el \
|
||||
%D%/guix-prettify.el \
|
||||
%D%/guix-profiles.el \
|
||||
%D%/guix-read.el \
|
||||
%D%/guix-ui.el \
|
||||
%D%/guix-ui-license.el \
|
||||
%D%/guix-ui-location.el \
|
||||
%D%/guix-ui-package.el \
|
||||
%D%/guix-ui-generation.el \
|
||||
%D%/guix-ui-system-generation.el \
|
||||
%D%/guix-utils.el
|
||||
|
||||
if HAVE_EMACS
|
||||
|
||||
dist_lisp_DATA = $(ELFILES)
|
||||
|
||||
nodist_lisp_DATA = \
|
||||
emacs/guix-config.el \
|
||||
%D%/guix-config.el \
|
||||
$(AUTOLOADS)
|
||||
|
||||
$(AUTOLOADS): $(ELFILES)
|
||||
|
|
|
@ -205,32 +205,53 @@ (define (run-container root mounts namespaces host-uids thunk)
|
|||
;; The parent process must initialize the user namespace for the child
|
||||
;; before it can boot. To negotiate this, a pipe is used such that the
|
||||
;; child process blocks until the parent writes to it.
|
||||
(match (pipe)
|
||||
((in . out)
|
||||
(match (socketpair PF_UNIX SOCK_STREAM 0)
|
||||
((child . parent)
|
||||
(let ((flags (namespaces->bit-mask namespaces)))
|
||||
(match (clone flags)
|
||||
(0
|
||||
(call-with-clean-exit
|
||||
(lambda ()
|
||||
(close out)
|
||||
(close-port parent)
|
||||
;; Wait for parent to set things up.
|
||||
(read in)
|
||||
(close in)
|
||||
(match (read child)
|
||||
('ready
|
||||
(purify-environment)
|
||||
(when (memq 'mnt namespaces)
|
||||
(catch #t
|
||||
(lambda ()
|
||||
(mount-file-systems root mounts
|
||||
#:mount-/proc? (memq 'pid namespaces)
|
||||
#:mount-/sys? (memq 'net namespaces)))
|
||||
#:mount-/sys? (memq 'net
|
||||
namespaces)))
|
||||
(lambda args
|
||||
;; Forward the exception to the parent process.
|
||||
(write args child)
|
||||
(primitive-exit 3))))
|
||||
;; TODO: Manage capabilities.
|
||||
(thunk))))
|
||||
(write 'ready child)
|
||||
(close-port child)
|
||||
(thunk))
|
||||
(_ ;parent died or something
|
||||
(primitive-exit 2))))))
|
||||
(pid
|
||||
(close-port child)
|
||||
(when (memq 'user namespaces)
|
||||
(initialize-user-namespace pid host-uids))
|
||||
;; TODO: Initialize cgroups.
|
||||
(close in)
|
||||
(write 'ready out)
|
||||
(close out)
|
||||
pid))))))
|
||||
(write 'ready parent)
|
||||
(newline parent)
|
||||
|
||||
;; Check whether the child process' setup phase succeeded.
|
||||
(let ((message (read parent)))
|
||||
(close-port parent)
|
||||
(match message
|
||||
('ready ;success
|
||||
pid)
|
||||
(((? symbol? key) args ...) ;exception
|
||||
(apply throw key args))
|
||||
(_ ;unexpected termination
|
||||
#f)))))))))
|
||||
|
||||
(define* (call-with-container mounts thunk #:key (namespaces %namespaces)
|
||||
(host-uids 1))
|
||||
|
|
1596
gnu/local.mk
1596
gnu/local.mk
File diff suppressed because it is too large
Load diff
|
@ -619,7 +619,8 @@ (define-public isc-dhcp
|
|||
"ISC's Dynamic Host Configuration Protocol (DHCP) distribution provides a
|
||||
reference implementation of all aspects of DHCP, through a suite of DHCP
|
||||
tools: server, client, and relay agent.")
|
||||
(license license:isc))))
|
||||
(license license:isc)
|
||||
(properties '((cpe-name . "dhcp"))))))
|
||||
|
||||
(define-public libpcap
|
||||
(package
|
||||
|
@ -1252,7 +1253,7 @@ (define-public libcap-ng
|
|||
(define-public smartmontools
|
||||
(package
|
||||
(name "smartmontools")
|
||||
(version "6.3")
|
||||
(version "6.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1260,7 +1261,7 @@ (define-public smartmontools
|
|||
version "/smartmontools-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"06gy71jh2d3gcfmlbbrsqw7215knkfq59q3j6qdxfrar39fhcxx7"))))
|
||||
"1g25r6sx85b5lay5n6sbnqv05qxzj6xsafsp93hnrg1h044bps49"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("libcap-ng" ,libcap-ng)))
|
||||
(home-page "http://www.smartmontools.org/")
|
||||
|
@ -1504,20 +1505,20 @@ (define-public iftop
|
|||
(define-public munge
|
||||
(package
|
||||
(name "munge")
|
||||
(version "0.5.11")
|
||||
(version "0.5.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/dun/munge/archive/munge-"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(uri (string-append "https://github.com/dun/munge/releases/"
|
||||
"download/munge-" version "/munge-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0njplyalwwqh7xr7xc7klc6x06mq0ak8w2pxh85w8n4hxkmqqnf5"))))
|
||||
"1s0vlwgm3hcx75vcmjf2y3icy5nv8y07bx93w2cmm6a7x71y6wp9"))))
|
||||
(inputs
|
||||
`(("openssl" ,openssl)
|
||||
("libgcrypt" ,libgcrypt)))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://dun.github.io/munge/")
|
||||
(home-page "https://dun.github.io/munge/")
|
||||
(synopsis "Cluster computing authentication service")
|
||||
(description
|
||||
"Munge is an authentication service for creating and validating
|
||||
|
|
|
@ -37,7 +37,7 @@ (define-module (gnu packages algebra)
|
|||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages tcsh)
|
||||
#:use-module (gnu packages texlive)
|
||||
#:use-module (gnu packages tex)
|
||||
#:use-module (gnu packages xiph)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013,2014 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2013, 2014 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -31,31 +31,31 @@ (define-module (gnu packages autogen)
|
|||
(define-public autogen
|
||||
(package
|
||||
(name "autogen")
|
||||
(version "5.18.7")
|
||||
(version "5.18.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/autogen"
|
||||
(uri (string-append "mirror://gnu/autogen/rel" version
|
||||
"/autogen-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01d4m8ckww12sy50vgyxlnz83z9dxqpyqp153cscncc9w6jq19d7"))))
|
||||
"0j61mf3qab5ya7w5xsp7xalrby00cv92g462bxffl104ql18w92f"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("perl" ,perl) ;for doc generator mdoc
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs `(("which" ,which)
|
||||
("guile" ,guile-2.0)))
|
||||
(arguments
|
||||
'(#:phases (alist-cons-before
|
||||
'patch-source-shebangs 'patch-test-scripts
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'patch-source-shebangs 'patch-test-scripts
|
||||
(lambda _
|
||||
(let ((sh (which "sh")))
|
||||
(substitute*
|
||||
(append (find-files "agen5/test" "\\.test$")
|
||||
(find-files "autoopts/test" "\\.(test|in)$"))
|
||||
(("/bin/sh") sh)
|
||||
(("/usr/bin/tr") "tr"))))
|
||||
%standard-phases)))
|
||||
(("/usr/bin/tr") "tr"))))))))
|
||||
(home-page "http://www.gnu.org/software/autogen/")
|
||||
(synopsis "Automated program generator")
|
||||
(description
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
|
||||
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016 David Thompson <davet@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -159,6 +160,27 @@ (define* (autoconf-wrapper #:optional (autoconf autoconf))
|
|||
port)))
|
||||
(chmod (string-append bin "/autoconf") #o555)))))))
|
||||
|
||||
(define-public autoconf-archive
|
||||
(package
|
||||
(name "autoconf-archive")
|
||||
(version "2016.03.20")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/autoconf-archive/autoconf-archive-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dz4fnc723jqn3by22ds5fys7g31apzm1r9allldvva0yvzjxyw8"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://www.gnu.org/software/autoconf-archive")
|
||||
(synopsis "Collection of freely reusable Autoconf macros")
|
||||
(description
|
||||
"Autoconf Archive is a collection of over 450 new macros for Autoconf,
|
||||
greatly expanding the domain of its functionality. These macros have been
|
||||
contributed as free software by the community.")
|
||||
(license gpl3+)))
|
||||
|
||||
(define-public autobuild
|
||||
(package
|
||||
(name "autobuild")
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2014, 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -19,52 +21,128 @@
|
|||
|
||||
(define-module (gnu packages avr)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages cross-base)
|
||||
#:use-module (gnu packages flashing-tools)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages vim)
|
||||
#:use-module (gnu packages zip))
|
||||
|
||||
(define-public avr-binutils
|
||||
(package
|
||||
(inherit (cross-binutils "avr"))
|
||||
(name "avr-binutils")))
|
||||
|
||||
(define-public avr-gcc-4.9
|
||||
(let ((xgcc (cross-gcc "avr" avr-binutils)))
|
||||
(package
|
||||
(inherit xgcc)
|
||||
(name "avr-gcc")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments xgcc)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
;; Without a working multilib build, the resulting GCC lacks
|
||||
;; support for nearly every AVR chip.
|
||||
(add-after 'unpack 'fix-genmultilib
|
||||
(lambda _
|
||||
;; patch-shebang doesn't work here because there are actually
|
||||
;; several scripts inside this script, each with a #!/bin/sh
|
||||
;; that needs patching.
|
||||
(substitute* "gcc/genmultilib"
|
||||
(("#!/bin/sh") (string-append "#!" (which "sh"))))
|
||||
#t))))
|
||||
((#:configure-flags flags)
|
||||
`(delete "--disable-multilib" ,flags))))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "CROSS_CPATH")
|
||||
(files '("avr/include")))
|
||||
(search-path-specification
|
||||
(variable "CROSS_LIBRARY_PATH")
|
||||
(files '("avr/lib"))))))))
|
||||
|
||||
(define-public avr-gcc-5
|
||||
(package
|
||||
(inherit avr-gcc-4.9)
|
||||
(version (package-version gcc-5))
|
||||
(source (package-source gcc-5))))
|
||||
|
||||
(define-public avr-libc
|
||||
(package
|
||||
(name "avr-libc")
|
||||
(version "1.8.1")
|
||||
(version "2.0.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://savannah//avr-libc/avr-libc-"
|
||||
(uri (string-append "mirror://savannah//avr-libc/avr-libc-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0sd9qkvhmk9av4g1f8dsjwc309hf1g0731bhvicnjb3b3d42l1n3"))))
|
||||
"15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:out-of-source? #t
|
||||
#:configure-flags '("--host=avr")))
|
||||
|
||||
(native-inputs `(("cross-binutils" ,(cross-binutils "avr"))
|
||||
("cross-gcc" ,xgcc-avr)))
|
||||
'(#:out-of-source? #t
|
||||
#:configure-flags '("--host=avr")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'unpack 'fix-cpath
|
||||
(lambda _
|
||||
;; C_INCLUDE_PATH poses issues for cross-building, leading to
|
||||
;; failures when building avr-libc on 64-bit systems. Simply
|
||||
;; unsetting it allows the build to succeed because it doesn't
|
||||
;; try to use any of the native system's headers.
|
||||
(unsetenv "C_INCLUDE_PATH")
|
||||
#t)))))
|
||||
(native-inputs `(("avr-binutils" ,avr-binutils)
|
||||
("avr-gcc" ,avr-gcc-4.9)))
|
||||
(home-page "http://www.nongnu.org/avr-libc/")
|
||||
(synopsis "The AVR C Library")
|
||||
(description
|
||||
"AVR Libc is a project whose goal is to provide a high quality C library
|
||||
for use with GCC on Atmel AVR microcontrollers.")
|
||||
(license (license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt"))))
|
||||
(license
|
||||
(license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt"))))
|
||||
|
||||
(define (avr-toolchain avr-gcc)
|
||||
(package
|
||||
(name "avr-toolchain")
|
||||
(version (package-version avr-gcc))
|
||||
(source #f)
|
||||
(build-system trivial-build-system)
|
||||
(arguments '(#:builder (mkdir %output)))
|
||||
(propagated-inputs
|
||||
`(("avrdude" ,avrdude)
|
||||
("binutils" ,avr-binutils)
|
||||
("gcc" ,avr-gcc)
|
||||
("libc" ,avr-libc)))
|
||||
(synopsis "Complete GCC tool chain for AVR microcontroller development")
|
||||
(description "This package provides a complete GCC tool chain for AVR
|
||||
microcontroller development. This includes the GCC AVR cross compiler and
|
||||
avrdude for firmware flashing. The supported programming languages are C and
|
||||
C++.")
|
||||
(home-page (package-home-page avr-libc))
|
||||
(license (package-license avr-gcc))))
|
||||
|
||||
(define-public avr-toolchain-4.9 (avr-toolchain avr-gcc-4.9))
|
||||
(define-public avr-toolchain-5 (avr-toolchain avr-gcc-5))
|
||||
|
||||
(define-public microscheme
|
||||
(package
|
||||
(name "microscheme")
|
||||
(version "0.9.2")
|
||||
(version "0.9.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/ryansuchocki/"
|
||||
"microscheme/archive/v" version ".zip"))
|
||||
"microscheme/archive/v" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0cmp1c6ilcib4w9ysqghav310g8jsq9gdfpfa9sd23wgl7mlncxf"))
|
||||
(file-name (string-append name "-" version ".zip"))))
|
||||
"1n404mh7z2icy3ga1mx249lk9x091k7idj6xpcf20hnmzabd0k0x"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:parallel-build? #f ; fails to build otherwise
|
||||
|
|
|
@ -404,13 +404,17 @@ (define-public libchop
|
|||
(define-public borg
|
||||
(package
|
||||
(name "borg")
|
||||
(version "1.0.2")
|
||||
(version "1.0.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "borgbackup" version))
|
||||
(uri (string-append
|
||||
"https://pypi.python.org/packages/"
|
||||
"c9/c6/1efc338724b054d4d264dfeadfcba11cefa6c3c50f474cec91b8f0c21d3a"
|
||||
"/borgbackup-" version ".tar.gz"))
|
||||
|
||||
(sha256
|
||||
(base32
|
||||
"1myz10pwxnac9z59gw1w3xjhz6ghx03vngpl97ca527pj0r39shi"))))
|
||||
"0kzr0xa00yjfxx27aipli67qg5ffj52yrnqhpf3sdy6k5wzwaybs"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -530,7 +530,10 @@ (define-public glibc
|
|||
,version)
|
||||
|
||||
(string-append "--with-headers="
|
||||
(assoc-ref %build-inputs "kernel-headers")
|
||||
(assoc-ref ,(if (%current-target-system)
|
||||
'%build-target-inputs
|
||||
'%build-inputs)
|
||||
"kernel-headers")
|
||||
"/include")
|
||||
|
||||
;; This is the default for most architectures as of GNU libc 2.21,
|
||||
|
|
|
@ -1482,7 +1482,7 @@ (define-public deeptools
|
|||
(define-public diamond
|
||||
(package
|
||||
(name "diamond")
|
||||
(version "0.8.1")
|
||||
(version "0.8.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1491,7 +1491,7 @@ (define-public diamond
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dqancz32c2l7w1b2vkvh5zqa2jnf99j1c41djnx1l8pxn044zdc"))))
|
||||
"18zx8k3axnsrg016kikl8xs1ifnjmj36dk1sv3fq1jgpg9j9584b"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no "check" target
|
||||
|
@ -2670,10 +2670,10 @@ (define-public python2-warpedlmm
|
|||
(license license:asl2.0)))
|
||||
|
||||
(define-public pbtranscript-tofu
|
||||
(let ((commit "8f5467fe6"))
|
||||
(let ((commit "8f5467fe6a4472bcfb4226c8720993c8507adfe4"))
|
||||
(package
|
||||
(name "pbtranscript-tofu")
|
||||
(version (string-append "2.2.3." commit))
|
||||
(version (string-append "2.2.3." (string-take commit 7)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -3009,7 +3009,7 @@ (define-public samtools-0.1
|
|||
(delete 'configure))))))))
|
||||
|
||||
(define-public mosaik
|
||||
(let ((commit "5c25216d"))
|
||||
(let ((commit "5c25216d3522d6a33e53875cd76a6d65001e4e67"))
|
||||
(package
|
||||
(name "mosaik")
|
||||
(version "2.2.30")
|
||||
|
@ -3259,10 +3259,10 @@ (define-public plink
|
|||
|
||||
(define-public smithlab-cpp
|
||||
(let ((revision "1")
|
||||
(commit "728a097"))
|
||||
(commit "728a097bec88c6f4b8528b685932049e660eff2e"))
|
||||
(package
|
||||
(name "smithlab-cpp")
|
||||
(version (string-append "0." revision "." commit))
|
||||
(version (string-append "0." revision "." (string-take commit 7)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -3885,6 +3885,47 @@ (define-public vsearch
|
|||
;; Dual licensed; also includes public domain source.
|
||||
(license (list license:gpl3 license:bsd-2))))
|
||||
|
||||
(define-public pardre
|
||||
(package
|
||||
(name "pardre")
|
||||
(version "1.1.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/pardre/ParDRe-rel"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0zkyjzv4s8q2h5npalhirbk17r5b1h0n2a42mh7njzlf047h9bhy"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests included
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
|
||||
(mkdir-p bin)
|
||||
(install-file "ParDRe" bin)
|
||||
#t))))))
|
||||
(inputs
|
||||
`(("openmpi" ,openmpi)
|
||||
("zlib" ,zlib)))
|
||||
(synopsis "Parallel tool to remove duplicate DNA reads")
|
||||
(description
|
||||
"ParDRe is a parallel tool to remove duplicate genetic sequence reads.
|
||||
Duplicate reads can be seen as identical or nearly identical sequences with
|
||||
some mismatches. This tool lets users avoid the analysis of unnecessary
|
||||
reads, reducing the time of subsequent procedures with the
|
||||
dataset (e.g. assemblies, mappings, etc.). The tool is implemented with MPI
|
||||
in order to exploit the parallel capabilities of multicore clusters. It is
|
||||
faster than multithreaded counterparts (end of 2015) for the same number of
|
||||
cores and, thanks to the message-passing technology, it can be executed on
|
||||
clusters.")
|
||||
(home-page "https://sourceforge.net/projects/pardre/")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public bio-locus
|
||||
(package
|
||||
(name "bio-locus")
|
||||
|
@ -4735,6 +4776,34 @@ (define-public r-genomation
|
|||
genomic intervals. In addition, it can use BAM or BigWig files as input.")
|
||||
(license license:artistic2.0)))
|
||||
|
||||
(define-public r-genomationdata
|
||||
(package
|
||||
(name "r-genomationdata")
|
||||
(version "1.4.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
;; We cannot use bioconductor-uri here because this tarball is
|
||||
;; located under "data/annotation/" instead of "bioc/".
|
||||
(uri (string-append "https://bioconductor.org/packages/"
|
||||
"release/data/experiment/src/contrib/"
|
||||
"genomationData_" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xzq2j722d8lcn5bc3aq3yb34xwis2d0bpsf6jsq4xw1bg0bsy79"))))
|
||||
(build-system r-build-system)
|
||||
;; As this package provides little more than large data files, it doesn't
|
||||
;; make sense to build substitutes.
|
||||
(arguments `(#:substitutable? #f))
|
||||
(native-inputs
|
||||
`(("r-knitr" ,r-knitr)))
|
||||
(home-page "http://bioinformatics.mdc-berlin.de/genomation/")
|
||||
(synopsis "Experimental data for use with the genomation package")
|
||||
(description
|
||||
"This package contains experimental genetic data for use with the
|
||||
genomation package. Included are Chip Seq, Methylation and Cage data,
|
||||
downloaded from Encode.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public r-org-hs-eg-db
|
||||
(package
|
||||
(name "r-org-hs-eg-db")
|
||||
|
@ -5100,7 +5169,7 @@ (define-public piranha
|
|||
("samtools" ,samtools-0.1)
|
||||
("gsl" ,gsl)
|
||||
("smithlab-cpp"
|
||||
,(let ((commit "3723e2d"))
|
||||
,(let ((commit "3723e2db438c51501d0423429ff396c3035ba46a"))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
|
@ -207,7 +207,7 @@ (define-public transmission-remote-cli
|
|||
(define-public aria2
|
||||
(package
|
||||
(name "aria2")
|
||||
(version "1.22.0")
|
||||
(version "1.23.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/tatsuhiro-t/aria2/"
|
||||
|
@ -215,7 +215,7 @@ (define-public aria2
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12agwdvvkr34wqhyyfp418dj0k7nbr297qmcd3wj5kkn7brv6gxc"))))
|
||||
"14qz7686zxnhbaqj6l1hqpkykhpygm74h2mzwhh13gqmcj38alaq"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--enable-libaria2")
|
||||
|
@ -230,10 +230,10 @@ (define-public aria2
|
|||
(("CPPUNIT_TEST_SUITE_REGISTRATION\\(LpdMessageReceiverTest\\);" text)
|
||||
(string-append "// " text))))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
`(("cppunit" ,cppunit) ; for the tests
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("c-ares" ,c-ares)
|
||||
("cppunit" ,cppunit) ; for the tests
|
||||
("gnutls" ,gnutls)
|
||||
("gmp" ,gmp)
|
||||
("libssh2" ,libssh2)
|
||||
|
@ -241,7 +241,7 @@ (define-public aria2
|
|||
("nettle" ,nettle)
|
||||
("sqlite" ,sqlite)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "http://aria2.sourceforge.net/")
|
||||
(home-page "https://aria2.github.io/")
|
||||
(synopsis "Utility for parallel downloading files")
|
||||
(description
|
||||
"Aria2 is a lightweight, multi-protocol & multi-source command-line
|
||||
|
|
|
@ -39,10 +39,10 @@ (define-module (gnu packages ci)
|
|||
#:use-module (guix build-system gnu))
|
||||
|
||||
(define-public hydra
|
||||
(let ((commit "4c0e3e4"))
|
||||
(let ((commit "4c0e3e47034545ad3e9e86dd069138bcebb8ccee"))
|
||||
(package
|
||||
(name "hydra")
|
||||
(version (string-append "20150407." commit))
|
||||
(version (string-append "20150407." (string-take commit 7)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
|
@ -54,7 +54,7 @@ (define-public cflow
|
|||
(build-system gnu-build-system)
|
||||
|
||||
;; Needed to have cflow-mode.el installed.
|
||||
(native-inputs `(("emacs" ,emacs-no-x)))
|
||||
(native-inputs `(("emacs" ,emacs-minimal)))
|
||||
|
||||
(home-page "http://www.gnu.org/software/cflow/")
|
||||
(synopsis "Create a graph of control flow within a program")
|
||||
|
|
|
@ -34,6 +34,7 @@ (define-module (gnu packages compression)
|
|||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system perl)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages backup)
|
||||
#:use-module (gnu packages base)
|
||||
|
@ -110,22 +111,38 @@ (define-public fastjar
|
|||
(define-public libtar
|
||||
(package
|
||||
(name "libtar")
|
||||
(version "1.2.11")
|
||||
(version "1.2.20")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
(uri (list
|
||||
(string-append
|
||||
"ftp://ftp.feep.net/pub/software/libtar/libtar-"
|
||||
version ".tar.gz"))
|
||||
version ".tar.gz")
|
||||
(string-append
|
||||
"mirror://debian/pool/main/libt/libtar/libtar_"
|
||||
version ".orig.tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"1f3vx1wa69a6c5y0z0aakd81gygirdcm0vimazg433q8nyvfybja"))))
|
||||
"02cihzl77ia0dcz7z2cga2412vyhhs5pa2355q4wpwbyga2lrwjh"))
|
||||
(patches (search-patches "libtar-CVE-2013-4420.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments `(#:tests? #f)) ;no "check" target
|
||||
(arguments
|
||||
`(#:tests? #f ;no "check" target
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'autoconf
|
||||
(lambda _ (zero? (system* "sh" "autoreconf" "-vfi")))))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)))
|
||||
(inputs
|
||||
`(("zlib" ,zlib)))
|
||||
(synopsis "C library for manipulating POSIX tar files")
|
||||
(description
|
||||
"libtar is a C library for manipulating POSIX tar files. It handles
|
||||
adding and extracting files to/from a tar archive.")
|
||||
(home-page "http://www.feep.net/libtar/")
|
||||
(home-page "https://repo.or.cz/libtar.git")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public gzip
|
||||
|
@ -426,16 +443,17 @@ (define-public sfarklib
|
|||
(license license:gpl3+)))
|
||||
|
||||
(define-public sfarkxtc
|
||||
(let ((commit "b5e0a2ba3921f019d74d4b92bd31c36dd19d2cf1"))
|
||||
(package
|
||||
(name "sfarkxtc")
|
||||
(version "b5e0a2ba39")
|
||||
(version (string-take commit 10))
|
||||
(source (origin
|
||||
;; There are no release tarballs, so we just fetch the latest
|
||||
;; commit at this time.
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/raboof/sfarkxtc.git")
|
||||
(commit version)))
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"0f5x6i46qfl6ry21s7g2p4sd4b2r1g4fb03yqi2vv4kq3saryhvj"))))
|
||||
|
@ -456,7 +474,7 @@ (define-public sfarkxtc
|
|||
(synopsis "Basic sfArk decompressor")
|
||||
(description "SfArk extractor converts SoundFonts in the compressed legacy
|
||||
sfArk file format to the uncompressed sf2 format.")
|
||||
(license license:gpl3+)))
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public libmspack
|
||||
(package
|
||||
|
|
|
@ -376,12 +376,6 @@ (define-public xgcc-mips64el
|
|||
(package-supported-systems xgcc)
|
||||
'("mips64el-linux" "i686-linux"))))))
|
||||
|
||||
(define-public xgcc-avr
|
||||
;; AVR cross-compiler, used to build AVR-Libc.
|
||||
(let ((triplet "avr"))
|
||||
(cross-gcc triplet
|
||||
(cross-binutils triplet))))
|
||||
|
||||
(define-public xgcc-xtensa
|
||||
;; Bare-bones Xtensa cross-compiler, used to build the Atheros firmware.
|
||||
(cross-gcc "xtensa-elf"))
|
||||
|
|
|
@ -30,7 +30,7 @@ (define-module (gnu packages crypto)
|
|||
(define-public libsodium
|
||||
(package
|
||||
(name "libsodium")
|
||||
(version "1.0.0")
|
||||
(version "1.0.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append
|
||||
|
@ -41,7 +41,7 @@ (define-public libsodium
|
|||
"releases/old/libsodium-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"19f9vf0shfp4rc4l791r6xjg06z4i8psj1zkjkm3z5b640yzxlff"))))
|
||||
"1gn45g956lyz8l6iq187yc6l627vyivyp8qc5dkr6dnhdnlqddvi"))))
|
||||
(build-system gnu-build-system)
|
||||
(synopsis "Portable NaCl-based crypto library")
|
||||
(description
|
||||
|
|
|
@ -34,7 +34,7 @@ (define-public cyrus-sasl
|
|||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append
|
||||
"http://cyrusimap.org/releases/cyrus-sasl-"
|
||||
"https://cyrusimap.org/releases/cyrus-sasl-"
|
||||
version ".tar.gz")
|
||||
(string-append
|
||||
"ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-"
|
||||
|
@ -63,4 +63,4 @@ (define-public cyrus-sasl
|
|||
server writers.")
|
||||
(license (license:non-copyleft "file://COPYING"
|
||||
"See COPYING in the distribution."))
|
||||
(home-page "http://cyrusimap.web.cmu.edu/index.php")))
|
||||
(home-page "http://cyrusimap.web.cmu.edu")))
|
||||
|
|
|
@ -55,7 +55,7 @@ (define-module (gnu packages databases)
|
|||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages jemalloc)
|
||||
#:use-module ((guix licenses)
|
||||
#:select (gpl2 gpl3+ lgpl2.1+ lgpl3+ x11-style non-copyleft
|
||||
#:select (gpl2 gpl3 gpl3+ lgpl2.1+ lgpl3+ x11-style non-copyleft
|
||||
bsd-2 bsd-3 public-domain))
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
|
@ -386,7 +386,7 @@ (define-public recutils
|
|||
(assoc-ref %build-inputs "bash:include")
|
||||
"/include/bash"))))
|
||||
|
||||
(native-inputs `(("emacs" ,emacs-no-x)
|
||||
(native-inputs `(("emacs" ,emacs-minimal)
|
||||
("bc" ,bc)
|
||||
("bash:include" ,bash "include")
|
||||
("libuuid" ,util-linux)))
|
||||
|
@ -919,3 +919,41 @@ (define-public kyotocabinet
|
|||
and B+ Tree data storage models. It is a fast key-value lightweight
|
||||
database and supports many programming languages. It is a NoSQL database.")
|
||||
(license gpl3+)))
|
||||
|
||||
(define-public wiredtiger
|
||||
(package
|
||||
(name "wiredtiger")
|
||||
(version "2.8.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://source.wiredtiger.com/releases/wiredtiger-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qh7y5paisdxq19jgg81ld7i32lz920n5k30hdpxnr8ll9c4hgjr"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--enable-lz4" "--enable-zlib")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'disable-test/fops
|
||||
(lambda _
|
||||
;; XXX: timed out after 3600 seconds of silence
|
||||
(substitute* "Makefile"
|
||||
(("test/fops") ""))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("lz4" ,lz4)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "http://source.wiredtiger.com/")
|
||||
(synopsis "NoSQL data engine")
|
||||
(description
|
||||
"WiredTiger is an extensible platform for data management. It supports
|
||||
row-oriented storage (where all columns of a row are stored together),
|
||||
column-oriented storage (where columns are stored in groups, allowing for
|
||||
more efficient access and storage of column subsets) and log-structured merge
|
||||
trees (LSM), for sustained throughput under random insert workloads.")
|
||||
(license gpl3) ; or GPL-2
|
||||
;; configure.ac: WiredTiger requires a 64-bit build.
|
||||
(supported-systems '("x86_64-linux" "mips64el-linux"))))
|
||||
|
|
|
@ -52,16 +52,16 @@ (define-public radicale
|
|||
(define-public vdirsyncer
|
||||
(package
|
||||
(name "vdirsyncer")
|
||||
(version "0.10.0")
|
||||
(version "0.11.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://pypi.python.org/packages/0b/fb/"
|
||||
"c42223e1e9169e4770194e62143d431755724b080d8cb"
|
||||
"77f14705b634815/"
|
||||
"vdirsyncer-" version ".tar.gz"))
|
||||
(uri (string-append
|
||||
"https://pypi.python.org/packages/"
|
||||
"39/e5/1e7097b5f0cd6de79ec9014f162a6000b77ca2a369ea8a1588a2eebff570/"
|
||||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1gf86sbd6w0w4zayh9r3irlp5jwrzbjikjc0vs5zkdpa5c199f78"))))
|
||||
"1bf0vk29qdswar0q4267aamfriq3134302i2p3qcqxpmmcwx3qfv"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -76,3 +77,41 @@ (define-public vera
|
|||
"V.E.R.A. (Virtual Entity of Relevant Acronyms) is a list of computing
|
||||
acronyms distributed as an info document.")
|
||||
(license fdl1.3+)))
|
||||
|
||||
(define-public gcide
|
||||
(package
|
||||
(name "gcide")
|
||||
(version "0.51")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://gnu/gcide/gcide-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1wm0s51ygc6480dq8gwahzr35ls8jgpf34yiwl5yqcaa0i19fdv7"))))
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
'(#:builder (begin
|
||||
(use-modules (guix build utils))
|
||||
(let* ((src (assoc-ref %build-inputs "source"))
|
||||
(tar (assoc-ref %build-inputs "tar"))
|
||||
(xz (assoc-ref %build-inputs "xz"))
|
||||
(out (assoc-ref %outputs "out"))
|
||||
(datadir (string-append out "/share/gcide")))
|
||||
(set-path-environment-variable "PATH" '("bin")
|
||||
(list tar xz))
|
||||
(mkdir-p datadir)
|
||||
(zero? (system* "tar" "-C" datadir
|
||||
"--strip-components=1"
|
||||
"-xvf" src))))
|
||||
#:modules ((guix build utils))))
|
||||
(native-inputs
|
||||
`(("tar" ,tar)
|
||||
("xz" ,xz)))
|
||||
(synopsis "GNU Collaborative International Dictionary of English")
|
||||
(description
|
||||
"GCIDE is a free dictionary based on a combination of sources. It can
|
||||
be used via the GNU Dico program or accessed online at
|
||||
http://gcide.gnu.org.ua/")
|
||||
(home-page "http://gcide.gnu.org.ua/")
|
||||
(license gpl3+)))
|
||||
|
|
|
@ -123,7 +123,7 @@ (define-public ddrescue
|
|||
(define-public dosfstools
|
||||
(package
|
||||
(name "dosfstools")
|
||||
(version "3.0.28")
|
||||
(version "4.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -132,14 +132,12 @@ (define-public dosfstools
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qkya6lald91c8nsf29jwnk0k5v42wlj24gacfdp3wpc8hq935gf"))))
|
||||
"1bvxbv1w6vhbx0nx7ygp700wq5k2hjv0hm7w0kz1x7amaf4p6dwh"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags (list (string-append "PREFIX=" %output)
|
||||
"CC=gcc")
|
||||
#:tests? #f ;no tests
|
||||
#:phases (modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
#:tests? #f)) ;no tests
|
||||
(home-page "https://github.com/dosfstools/dosfstools")
|
||||
(synopsis "Utilities for making and checking MS-DOS FAT filesystems")
|
||||
(description
|
||||
|
|
|
@ -33,7 +33,7 @@ (define-module (gnu packages dns)
|
|||
(define-public dnsmasq
|
||||
(package
|
||||
(name "dnsmasq")
|
||||
(version "2.72")
|
||||
(version "2.76")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -41,7 +41,7 @@ (define-public dnsmasq
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1c80hq09hfm8cp5pirfb8wdlc7dqkp7zzmbmdaradcvlblzx42vx"))))
|
||||
"15lzih6671gh9knzpl8mxchiml7z5lfqzr7jm2r0rjhrxs6nk4jb"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -23,7 +23,7 @@ (define-module (gnu packages docbook)
|
|||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages imagemagick)
|
||||
#:use-module (gnu packages inkscape)
|
||||
#:use-module (gnu packages texlive)
|
||||
#:use-module (gnu packages tex)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages xml)
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -60,7 +61,7 @@ (define-public chmlib
|
|||
(define-public calibre
|
||||
(package
|
||||
(name "calibre")
|
||||
(version "2.51.0")
|
||||
(version "2.58.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -69,7 +70,7 @@ (define-public calibre
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rhpcxic4g2zyr5s3xn8dayyb45l9r8zyniaig8j7pl5kmsfjijn"))
|
||||
"0npqvfjqj1vwa7nmnsyd4d30z40brydw275ldf1jankrp6dr9dyd"))
|
||||
;; Remove non-free or doubtful code, see
|
||||
;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
|
||||
(modules '((guix build utils)))
|
||||
|
|
|
@ -30,7 +30,7 @@ (define-module (gnu packages elf)
|
|||
(define-public elfutils
|
||||
(package
|
||||
(name "elfutils")
|
||||
(version "0.161")
|
||||
(version "0.166")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -38,7 +38,7 @@ (define-public elfutils
|
|||
version "/elfutils-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0w50szymyqvx8g0vkwrvnv17grqxva6x1z9dm9m3i99zg2hr232p"))
|
||||
"0c5s9klq1zyb0zkmrw636k97kz30p5ih8y8dpq8b4f54r0a6j19w"))
|
||||
(patches (search-patches "elfutils-tests-ptrace.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
|
||||
|
|
|
@ -9,6 +9,9 @@
|
|||
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;; Copyright © 2015, 2016 Christopher Allan Webber <cwebber@dustycloud.org>
|
||||
;;; Copyright © 2016 humanitiesNerd <catonano@gmail.com>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -80,7 +83,19 @@ (define-public emacs
|
|||
(base32
|
||||
"0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx"))
|
||||
(patches (search-patches "emacs-exec-path.patch"
|
||||
"emacs-source-date-epoch.patch"))))
|
||||
"emacs-fix-scheme-indent-function.patch"
|
||||
"emacs-source-date-epoch.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Delete the bundled byte-compiled elisp files and
|
||||
;; generated autoloads.
|
||||
'(with-directory-excursion "lisp"
|
||||
(for-each delete-file
|
||||
(append (find-files "." "\\.elc$")
|
||||
(find-files "." "loaddefs\\.el$")
|
||||
;; This is the only "autoloads" file that
|
||||
;; does not have "*loaddefs.el" name.
|
||||
'("eshell/esh-groups.el")))))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -159,9 +174,24 @@ (define-public emacs
|
|||
languages.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-no-x
|
||||
(define-public emacs-minimal
|
||||
;; This is the version that you should use as an input to packages that just
|
||||
;; need to byte-compile .el files.
|
||||
(package (inherit emacs)
|
||||
(name "emacs-minimal")
|
||||
(synopsis "The extensible text editor (used only for byte-compilation)")
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments emacs)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(delete 'install-site-start)))))
|
||||
(inputs
|
||||
`(("ncurses" ,ncurses)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))))
|
||||
|
||||
(define-public emacs-no-x
|
||||
(package (inherit emacs)
|
||||
(name "emacs-no-x")
|
||||
(synopsis "The extensible, customizable, self-documenting text
|
||||
|
@ -241,8 +271,8 @@ (define-public geiser
|
|||
"/share/emacs/site-lisp/"
|
||||
"geiser-autoloads.el")))
|
||||
%standard-phases)))
|
||||
(inputs `(("guile" ,guile-2.0)
|
||||
("emacs" ,emacs-no-x)))
|
||||
(inputs `(("guile" ,guile-2.0)))
|
||||
(native-inputs `(("emacs" ,emacs-minimal)))
|
||||
(home-page "http://nongnu.org/geiser/")
|
||||
(synopsis "Collection of Emacs modes for Guile and Racket hacking")
|
||||
(description
|
||||
|
@ -296,7 +326,7 @@ (define-public paredit
|
|||
(base32
|
||||
"0pp3n8q6kc70blqsaw0zlzp6bc327dpgdrjr0cnh7hqg1lras7ka"))))
|
||||
(build-system trivial-build-system)
|
||||
(inputs `(("emacs" ,emacs-no-x)))
|
||||
(native-inputs `(("emacs" ,emacs-minimal)))
|
||||
(arguments
|
||||
`(#:modules ((guix build utils)
|
||||
(guix build emacs-utils))
|
||||
|
@ -367,7 +397,7 @@ (define-public git-modes
|
|||
(lisp (string-append
|
||||
out "/share/emacs/site-lisp/")))
|
||||
(emacs-generate-autoloads ,name lisp)))))))
|
||||
(native-inputs `(("emacs" ,emacs-no-x)))
|
||||
(native-inputs `(("emacs" ,emacs-minimal)))
|
||||
(home-page "https://github.com/magit/git-modes")
|
||||
(synopsis "Emacs major modes for Git configuration files")
|
||||
(description
|
||||
|
@ -403,7 +433,7 @@ (define-public emacs-with-editor
|
|||
(define-public magit
|
||||
(package
|
||||
(name "magit")
|
||||
(version "2.6.2")
|
||||
(version "2.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -411,10 +441,10 @@ (define-public magit
|
|||
version "/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0im1jrqw29g5anrrjflj6b2gpyqkvpghnq8zvywxyhmjwzar4rn7"))))
|
||||
"1kzd8k2n0lcr04jvn5b6d29zf765mxgshfhzflkzndwmvyxmlqpl"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("texinfo" ,texinfo)
|
||||
("emacs" ,emacs-no-x)))
|
||||
("emacs" ,emacs-minimal)))
|
||||
(inputs `(("git" ,git)))
|
||||
(propagated-inputs
|
||||
`(("dash" ,emacs-dash)
|
||||
|
@ -476,7 +506,7 @@ (define-public magit-svn
|
|||
(base32
|
||||
"04y88j7q9h8xjbx5dbick6n5nr1522sn9i1znp0qwk3vjb4b5mzz"))))
|
||||
(build-system trivial-build-system)
|
||||
(native-inputs `(("emacs" ,emacs-no-x)
|
||||
(native-inputs `(("emacs" ,emacs-minimal)
|
||||
("tar" ,tar)
|
||||
("gzip" ,gzip)))
|
||||
(propagated-inputs `(("dash" ,emacs-dash)
|
||||
|
@ -534,9 +564,9 @@ (define-public haskell-mode
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1kxc2yj8vb122dv91r68h7c5ladcryx963fr16plfhg71fv7f9av"))))
|
||||
(inputs `(("emacs" ,emacs-no-x)))
|
||||
(native-inputs
|
||||
`(("texinfo" ,texinfo)))
|
||||
`(("emacs" ,emacs-minimal)
|
||||
("texinfo" ,texinfo)))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags (list (string-append "EMACS="
|
||||
|
@ -616,7 +646,7 @@ (define-public let-alist
|
|||
(setenv "PATH" (string-append emacs "/bin"))
|
||||
(emacs-byte-compile-directory lispdir)
|
||||
#t))))
|
||||
(native-inputs `(("emacs" ,emacs-no-x)))
|
||||
(native-inputs `(("emacs" ,emacs-minimal)))
|
||||
(home-page "http://elpa.gnu.org/packages/let-alist.html")
|
||||
(synopsis "Easily let-bind values of an assoc-list by their names")
|
||||
(description
|
||||
|
@ -675,10 +705,10 @@ (define-public emacs-w3m
|
|||
(base32
|
||||
"0zfxmq86pwk64yv0426gnjrvhjrgrjqn08sdcdhmmjmfpmqvm79y"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("autoconf" ,autoconf)))
|
||||
(native-inputs `(("autoconf" ,autoconf)
|
||||
("emacs" ,emacs-minimal)))
|
||||
(inputs `(("w3m" ,w3m)
|
||||
("imagemagick" ,imagemagick)
|
||||
("emacs" ,emacs-no-x)))
|
||||
("imagemagick" ,imagemagick)))
|
||||
(arguments
|
||||
`(#:modules ((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
|
@ -747,8 +777,8 @@ (define-public emacs-wget
|
|||
(sha256
|
||||
(base32 "10byvyv9dk0ib55gfqm7bcpxmx2qbih1jd03gmihrppr2mn52nff"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("wget" ,wget)
|
||||
("emacs" ,emacs-no-x)))
|
||||
(inputs `(("wget" ,wget)))
|
||||
(native-inputs `(("emacs" ,emacs-minimal)))
|
||||
(arguments
|
||||
`(#:modules ((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
|
@ -790,14 +820,14 @@ (define-public emacs-wget
|
|||
(define-public emms
|
||||
(package
|
||||
(name "emms")
|
||||
(version "4.0")
|
||||
(version "4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/emms/emms-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1q0n3iwva8bvai2rl9sm49sdjmk0wi7vajz4knz01l7g67nrp87l"))
|
||||
"0ay6631p3dr6xnhkm7skwn0gp317r1mxbip28m126w4zqf05cbh3"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(substitute* "Makefile"
|
||||
|
@ -823,8 +853,9 @@ (define-public emms
|
|||
#:imported-modules (,@%gnu-build-system-modules
|
||||
(guix build emacs-utils))
|
||||
|
||||
#:phases (alist-replace
|
||||
'configure
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(vorbis (assoc-ref inputs "vorbis-tools"))
|
||||
|
@ -863,18 +894,15 @@ (define-public emms
|
|||
(string-append "\"" alsa "/bin/amixer\"")))
|
||||
(substitute* "emms-tag-editor.el"
|
||||
(("\"mp3info\"")
|
||||
(string-append "\"" mp3info "/bin/mp3info\""))))))
|
||||
(alist-cons-before
|
||||
'install 'pre-install
|
||||
(string-append "\"" mp3info "/bin/mp3info\"")))))))
|
||||
(add-before 'install 'pre-install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; The 'install' rule expects the target directory to
|
||||
;; exist.
|
||||
;; The 'install' rule expects the target directory to exist.
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(man1 (string-append out "/share/man/man1")))
|
||||
(mkdir-p man1)
|
||||
#t))
|
||||
(alist-cons-after
|
||||
'install 'post-install
|
||||
#t)))
|
||||
(add-after 'install 'post-install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(target (string-append
|
||||
|
@ -884,10 +912,9 @@ (define-public emms
|
|||
"emms-autoloads.el"))
|
||||
(mkdir-p (dirname target))
|
||||
(copy-file "src/emms-print-metadata" target)
|
||||
(chmod target #o555)))
|
||||
%standard-phases)))
|
||||
(chmod target #o555)))))
|
||||
#:tests? #f))
|
||||
(native-inputs `(("emacs" ,emacs-no-x) ;for (guix build emacs-utils)
|
||||
(native-inputs `(("emacs" ,emacs-minimal) ;for (guix build emacs-utils)
|
||||
("texinfo" ,texinfo)))
|
||||
(inputs `(("alsa-utils" ,alsa-utils)
|
||||
("vorbis-tools" ,vorbis-tools)
|
||||
|
@ -937,7 +964,7 @@ (define-public bbdb
|
|||
(with-directory-excursion site
|
||||
(symlink "bbdb-loaddefs.el" "bbdb-autoloads.el"))))
|
||||
%standard-phases)))
|
||||
(native-inputs `(("emacs" ,emacs-no-x)))
|
||||
(native-inputs `(("emacs" ,emacs-minimal)))
|
||||
(home-page "http://savannah.nongnu.org/projects/bbdb/")
|
||||
(synopsis "Contact management utility for Emacs")
|
||||
(description
|
||||
|
@ -950,14 +977,14 @@ (define-public bbdb
|
|||
(define-public emacs-async
|
||||
(package
|
||||
(name "emacs-async")
|
||||
(version "1.6")
|
||||
(version "1.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://elpa.gnu.org/packages/async-"
|
||||
version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"17psvz75n42x33my967wkgi7r0blx46n3jdv510j0z5jswv66039"))))
|
||||
"1ip5nc8xyln5szvqwp6wqva9xr84pn8ssn3nnphrszr19y4js2bm"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://elpa.gnu.org/packages/async.html")
|
||||
(synopsis "Asynchronous processing in Emacs")
|
||||
|
@ -983,6 +1010,9 @@ (define-public emacs-auctex
|
|||
(base32
|
||||
"1pmki8hdjjikxlvip3pzi350bln3gcimr27yjf0xfwjvnp5hh9nc"))))
|
||||
(build-system emacs-build-system)
|
||||
;; We use 'emacs' because AUCTeX requires dbus at compile time
|
||||
;; ('emacs-minimal' does not provide dbus).
|
||||
(arguments `(#:emacs ,emacs))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)))
|
||||
(home-page "http://www.gnu.org/software/auctex/")
|
||||
|
@ -1017,7 +1047,7 @@ (define-public emacs-mmm-mode
|
|||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("emacs" ,emacs-no-x)
|
||||
("emacs" ,emacs-minimal)
|
||||
("texinfo" ,texinfo)))
|
||||
(home-page "https://github.com/purcell/mmm-mode")
|
||||
(synopsis "Allow multiple major modes in an Emacs buffer")
|
||||
|
@ -1081,7 +1111,7 @@ (define-public emacs-pdf-tools
|
|||
(native-inputs `(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("pkg-config" ,pkg-config)
|
||||
("emacs" ,emacs-no-x)))
|
||||
("emacs" ,emacs-minimal)))
|
||||
(propagated-inputs
|
||||
`(("let-alist" ,let-alist)))
|
||||
(inputs `(("poppler" ,poppler)
|
||||
|
@ -1200,7 +1230,7 @@ (define-public emacs-ob-ipython
|
|||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(commit "8807064693")
|
||||
(commit "880706469338ab59b5bb7dbe8460016f89755364")
|
||||
(url "https://github.com/gregsexton/ob-ipython.git")))
|
||||
(sha256
|
||||
(base32
|
||||
|
@ -1385,20 +1415,6 @@ (define-public emacs-mit-scheme-doc
|
|||
identifiers in the MIT-Scheme documentation.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
;;; XXX: move this procedure to an utility module
|
||||
(define* (uncompressed-file-fetch url hash-algo hash
|
||||
#:optional name
|
||||
#:key (system (%current-system))
|
||||
(guile (default-guile)))
|
||||
(mlet %store-monad ((drv (url-fetch url hash-algo hash name
|
||||
#:system system
|
||||
#:guile guile)))
|
||||
(gexp->derivation (or name (basename url))
|
||||
#~(begin
|
||||
(mkdir #$output)
|
||||
(chdir #$output)
|
||||
(copy-file #$drv (basename #$url))))))
|
||||
|
||||
(define-public emacs-constants
|
||||
(package
|
||||
(name "emacs-constants")
|
||||
|
@ -1406,7 +1422,7 @@ (define-public emacs-constants
|
|||
(home-page "https://staff.fnwi.uva.nl/c.dominik/Tools/constants")
|
||||
(source
|
||||
(origin
|
||||
(file-name (string-append name "-" version ".el"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/fedeinthemix/emacs-constants"
|
||||
"/archive/v" version ".tar.gz"))
|
||||
|
@ -1493,8 +1509,6 @@ (define-public emacs-popup
|
|||
(base32
|
||||
"1yrgfj8y69xmcb6kwgplhq68ndm9410qwh7sd2knnd1gchpphdc0"))))
|
||||
(build-system emacs-build-system)
|
||||
(native-inputs
|
||||
`(("emacs" ,emacs-no-x)))
|
||||
(home-page "https://github.com/auto-complete/popup-el")
|
||||
(synopsis "Visual Popup User Interface for Emacs")
|
||||
(description
|
||||
|
@ -1536,14 +1550,12 @@ (define-public emacs-rfcview
|
|||
(version "0.13")
|
||||
(home-page "http://www.loveshack.ukfsn.org/emacs")
|
||||
(source (origin
|
||||
(method uncompressed-file-fetch)
|
||||
(method url-fetch)
|
||||
(uri "http://www.loveshack.ukfsn.org/emacs/rfcview.el")
|
||||
(sha256
|
||||
(base32
|
||||
"0ympj5rxig383zl2jf0pzdsa80nnq0dpvjiriq0ivfi98fj7kxbz"))))
|
||||
(build-system emacs-build-system)
|
||||
(native-inputs
|
||||
`(("emacs" ,emacs-no-x)))
|
||||
(synopsis "Prettify Request for Comments (RFC) documents")
|
||||
(description "The Internet Engineering Task Force (IETF) and the Internet
|
||||
Society (ISOC) publish various Internet-related protocols and specifications
|
||||
|
@ -1562,14 +1574,12 @@ (define-public emacs-ffap-rfc-space
|
|||
(version "12")
|
||||
(home-page "http://user42.tuxfamily.org/ffap-rfc-space/index.html")
|
||||
(source (origin
|
||||
(method uncompressed-file-fetch)
|
||||
(method url-fetch)
|
||||
(uri "http://download.tuxfamily.org/user42/ffap-rfc-space.el")
|
||||
(sha256
|
||||
(base32
|
||||
"1iv61dv57a73mdps7rn6zmgz7nqh14v0ninidyrasy45b1nv6gck"))))
|
||||
(build-system emacs-build-system)
|
||||
(native-inputs
|
||||
`(("emacs" ,emacs-no-x)))
|
||||
(synopsis "Make ffap recognize an RFC with a space before its number")
|
||||
(description "The Internet Engineering Task Force (IETF) and the
|
||||
Internet Society (ISOC) publish various Internet-related protocols and
|
||||
|
@ -1631,3 +1641,443 @@ (define-public emacs-smartparens
|
|||
features found in other packages it also brings many improvements as
|
||||
well as completely new features.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-clojure-mode
|
||||
(package
|
||||
(name "emacs-clojure-mode")
|
||||
(version "5.3.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/clojure-emacs/clojure-mode/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gi8ra3ap5m3mz4qh1yxp2cldn7z9xcxvypznr6rrlc6a9l8s5a6"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://github.com/clojure-emacs/clojure-mode")
|
||||
(synopsis "Major mode for Clojure code")
|
||||
(description
|
||||
"This Emacs package provides font-lock, indentation, navigation and basic
|
||||
refactoring for the @uref{http://clojure.org, Clojure programming language}.
|
||||
It is recommended to use @code{clojure-mode} with paredit or smartparens.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-epl
|
||||
(package
|
||||
(name "emacs-epl")
|
||||
(version "0.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/cask/epl/archive/"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1511n3a3f5gvaf2b4nh018by61ciyzi3y3603fzqma7p9hrckarc"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://github.com/cask/epl")
|
||||
(synopsis "Emacs Package Library")
|
||||
(description
|
||||
"A package management library for Emacs, based on @code{package.el}.
|
||||
|
||||
The purpose of this library is to wrap all the quirks and hassle of
|
||||
@code{package.el} into a sane API.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-queue
|
||||
(package
|
||||
(name "emacs-queue")
|
||||
(version "0.1.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://elpa.gnu.org/packages/queue-"
|
||||
version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jw24fxqnf9qcaf2nh09cnds1kqfk7hal35dw83x1ari95say391"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://www.dr-qubit.org/tags/computing-code-emacs.html")
|
||||
(synopsis "Queue data structure for Emacs")
|
||||
(description
|
||||
"This Emacs library provides queue data structure. These queues can be
|
||||
used both as a first-in last-out (FILO) and as a first-in first-out (FIFO)
|
||||
stack, i.e. elements can be added to the front or back of the queue, and can
|
||||
be removed from the front. This type of data structure is sometimes called an
|
||||
\"output-restricted deque\".")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-pkg-info
|
||||
(package
|
||||
(name "emacs-pkg-info")
|
||||
(version "0.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/lunaryorn/pkg-info.el/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1gy1jks5mmm02gg1c8gcyr4f8a9s5ggzhk56gv33b9mzjqzi5rd5"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs `(("emacs-epl" ,emacs-epl)))
|
||||
(home-page "https://github.com/lunaryorn/pkg-info.el")
|
||||
(synopsis "Information about Emacs packages")
|
||||
(description
|
||||
"This library extracts information from the installed Emacs packages.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-spinner
|
||||
(package
|
||||
(name "emacs-spinner")
|
||||
(version "1.7.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://elpa.gnu.org/packages/spinner-"
|
||||
version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"1fmwzdih0kbyvs8bn38mpm4sbs2mikqy2vdykfy9g20wpa8vb681"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/Malabarba/spinner.el")
|
||||
(synopsis "Emacs mode-line spinner for operations in progress")
|
||||
(description
|
||||
"This Emacs package adds spinners and progress-bars to the mode-line for
|
||||
ongoing operations.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-seq
|
||||
(package
|
||||
(name "emacs-seq")
|
||||
(version "2.15")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://elpa.gnu.org/packages/seq-"
|
||||
version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"09wi1765bmn7i8fg6ajjfaxgs4ipc42d58zx2fdqpidrdg9c7q73"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://elpa.gnu.org/packages/seq.html")
|
||||
(synopsis "Sequence manipulation functions for Emacs")
|
||||
(description
|
||||
"This Emacs library provides sequence-manipulation functions that
|
||||
complement basic functions provided by @code{subr.el}. All provided functions
|
||||
work on lists, strings and vectors.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-better-defaults
|
||||
(package
|
||||
(name "emacs-better-defaults")
|
||||
(version "0.1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/technomancy/better-defaults"
|
||||
"/archive/" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08fg4zslzlxbvyil5g4gwvwd22fh4zsgqprs5wh9hv1rgc6757m2"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/technomancy/better-defaults")
|
||||
(synopsis "Better defaults for Emacs")
|
||||
(description
|
||||
"Better defaults attempts to address the most obvious deficiencies of the
|
||||
Emacs default configuration in uncontroversial ways that nearly everyone can
|
||||
agree upon.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-smex
|
||||
(package
|
||||
(name "emacs-smex")
|
||||
(version "3.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://raw.githubusercontent.com"
|
||||
"/nonsequitur/smex/" version "/smex.el"))
|
||||
(file-name (string-append "smex-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ar310zx9k5y4i1vl2rawvi712xj9gx77160860jbs691p77cxqp"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://github.com/nonsequitur/smex/")
|
||||
(synopsis "M-x interface with Ido-style fuzzy matching")
|
||||
(description
|
||||
"Smex is a M-x enhancement for Emacs. Built on top of Ido, it provides a
|
||||
convenient interface to your recently and most frequently used commands. And
|
||||
to all the other commands, too.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-js2-mode
|
||||
(package
|
||||
(name "emacs-js2-mode")
|
||||
(version "20150909")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/mooz/js2-mode/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1nsm36c4kwb473p13i58fgrnlk8fbn3rdhj47d9xz70az4ra44q0"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/mooz/js2-mode/")
|
||||
(synopsis "Improved JavaScript editing mode for Emacs")
|
||||
(description
|
||||
"Js2-mode provides a JavaScript major mode for Emacs that is more
|
||||
advanced than the built-in javascript-mode. Features include accurate syntax
|
||||
highlighting using a recursive-descent parser, on-the-fly reporting of syntax
|
||||
errors and strict-mode warnings, smart line-wrapping within comments and
|
||||
strings, and code folding.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-markdown-mode
|
||||
(package
|
||||
(name "emacs-markdown-mode")
|
||||
(version "2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://raw.githubusercontent.com/jrblevin"
|
||||
"/markdown-mode/v" version
|
||||
"/markdown-mode.el"))
|
||||
(file-name (string-append "markdown-mode-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"1faibar32jnjia9202swblw91q6z1g5s4k9xmypwjahfh8yznl6w"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://jblevins.org/projects/markdown-mode/")
|
||||
(synopsis "Emacs Major mode for Markdown files")
|
||||
(description
|
||||
"Markdown-mode is a major mode for editing Markdown-formatted text files
|
||||
in Emacs.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-projectile
|
||||
(package
|
||||
(name "emacs-projectile")
|
||||
(version "0.13.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://raw.githubusercontent.com/bbatsov"
|
||||
"/projectile/v" version "/projectile.el"))
|
||||
(file-name (string-append "projectile-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"1pc6xb61hzxzc5hkqkli1ab0s7wz0rfgx4kcn9y30ksvhw18smbz"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-dash" ,emacs-dash)
|
||||
("emacs-pkg-info" ,emacs-pkg-info)))
|
||||
(home-page "https://github.com/bbatsov/projectile")
|
||||
(synopsis "Manage and navigate projects in Emacs easily")
|
||||
(description
|
||||
"This library provides easy project management and navigation. The
|
||||
concept of a project is pretty basic - just a folder containing special file.
|
||||
Currently git, mercurial and bazaar repos are considered projects by default.
|
||||
If you want to mark a folder manually as a project just create an empty
|
||||
.projectile file in it.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-elfeed
|
||||
(package
|
||||
(name "emacs-elfeed")
|
||||
(version "1.4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/skeeto/elfeed/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0i75r8x9ypbfjlnym04h16ikcrlks86p7wsgawrx7mh1lk4inp89"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/skeeto/elfeed")
|
||||
(synopsis "Atom/RSS feed reader for Emacs")
|
||||
(description
|
||||
"Elfeed is an extensible web feed reader for Emacs, supporting both Atom
|
||||
and RSS, with a user interface inspired by notmuch.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-rainbow-delimiters
|
||||
(package
|
||||
(name "emacs-rainbow-delimiters")
|
||||
(version "2.1.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://raw.githubusercontent.com/Fanael"
|
||||
"/rainbow-delimiters/" version
|
||||
"/rainbow-delimiters.el"))
|
||||
(file-name (string-append "rainbow-delimiters-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"1b3kampwsjabhcqdp0khgff13wc5jqhy3rbvaa12vnv7qy22l9ck"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/Fanael/rainbow-delimiters")
|
||||
(synopsis "Highlight brackets according to their depth")
|
||||
(description
|
||||
"Rainbow-delimiters is a \"rainbow parentheses\"-like mode for Emacs which
|
||||
highlights parentheses, brackets, and braces according to their depth. Each
|
||||
successive level is highlighted in a different color, making it easy to spot
|
||||
matching delimiters, orient yourself in the code, and tell which statements
|
||||
are at a given level.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-ido-completing-read+
|
||||
(package
|
||||
(name "emacs-ido-completing-read+")
|
||||
(version "3.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://raw.githubusercontent.com"
|
||||
"/DarwinAwardWinner/ido-ubiquitous/v"
|
||||
version "/ido-completing-read+.el"))
|
||||
(file-name (string-append "ido-completing-read+-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"1cyalb0p7nfsm4n6n9q6rjmvn6adqc0fq8ybnlj3n41n289dkfjf"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/DarwinAwardWinner/ido-ubiquitous")
|
||||
(synopsis "Replacement for completing-read using ido")
|
||||
(description
|
||||
"The ido-completing-read+ function is a wrapper for ido-completing-read.
|
||||
Importantly, it detects edge cases that ordinary ido cannot handle and either
|
||||
adjusts them so ido can handle them, or else simply falls back to the standard
|
||||
Emacs completion function instead.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-ido-ubiquitous
|
||||
(package
|
||||
(name "emacs-ido-ubiquitous")
|
||||
(version "3.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://raw.githubusercontent.com"
|
||||
"/DarwinAwardWinner/ido-ubiquitous/v"
|
||||
version "/ido-ubiquitous.el"))
|
||||
(file-name (string-append "ido-ubiquitous-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"197ypji0fb6jsdcq40rpnknwlh3imas6s6jbsvkfm0pz9988c3q2"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-ido-completing-read+" ,emacs-ido-completing-read+)))
|
||||
(home-page "https://github.com/DarwinAwardWinner/ido-ubiquitous")
|
||||
(synopsis "Use ido (nearly) everywhere")
|
||||
(description
|
||||
"Ido-ubiquitous enables ido-style completion for almost every function
|
||||
that uses the standard completion function completing-read.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-yaml-mode
|
||||
(package
|
||||
(name "emacs-yaml-mode")
|
||||
(version "0.0.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://raw.githubusercontent.com/yoshiki"
|
||||
"/yaml-mode/v" version "/yaml-mode.el"))
|
||||
(file-name (string-append "yaml-mode-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"17wq433ycli0qx4gdhgrmb392qblm6y2dwcyn38j5ja1lasfb0ax"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/yoshiki/yaml-mode")
|
||||
(synopsis "Major mode for editing YAML files")
|
||||
(description
|
||||
"Yaml-mode is an Emacs major mode for editing files in the YAML data
|
||||
serialization format. It was initially developed by Yoshiki Kurihara and many
|
||||
features were added by Marshall Vandegrift. As YAML and Python share the fact
|
||||
that indentation determines structure, this mode provides indentation and
|
||||
indentation command behavior very similar to that of python-mode.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-web-mode
|
||||
(package
|
||||
(name "emacs-web-mode")
|
||||
(version "14")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://raw.githubusercontent.com/fxbois"
|
||||
"/web-mode/v" version "/web-mode.el"))
|
||||
(file-name (string-append "web-mode-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"086hik5fmxg3kx74qmransx9cz961qd22d4m6ah2dw6cwaj1s3s5"))))
|
||||
(build-system emacs-build-system)
|
||||
(synopsis "Major mode for editing web templates")
|
||||
(description "Web-mode is an Emacs major mode for editing web templates
|
||||
aka HTML files embedding parts (CSS/JavaScript) and blocks (pre rendered by
|
||||
client/server side engines). Web-mode is compatible with many template
|
||||
engines: PHP, JSP, ASP, Django, Twig, Jinja, Mustache, ERB, FreeMarker,
|
||||
Velocity, Cheetah, Smarty, CTemplate, Mustache, Blade, ErlyDTL, Go Template,
|
||||
Dust.js, React/JSX, Angularjs, ejs, etc.")
|
||||
(home-page "http://web-mode.org/")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-helm
|
||||
(package
|
||||
(name "emacs-helm")
|
||||
(version "1.9.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/" name "/helm/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fc897rwf1fm2m7jrsikkgcyzhngfcysxfmzchpwzfj6v9sb5rl9"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-async" ,emacs-async)
|
||||
("emacs-popup" ,emacs-popup)))
|
||||
(home-page "https://emacs-helm.github.io/helm/")
|
||||
(synopsis "Incremental completion and selection narrowing
|
||||
framework for Emacs")
|
||||
(description "Helm is incremental completion and selection narrowing
|
||||
framework for Emacs. It will help steer you in the right direction when
|
||||
you're looking for stuff in Emacs (like buffers, files, etc). Helm is a fork
|
||||
of @code{anything.el} originally written by Tamas Patrovic and can be
|
||||
considered to be its successor. Helm sets out to clean up the legacy code in
|
||||
@code{anything.el} and provide a cleaner, leaner and more modular tool, that's
|
||||
not tied in the trap of backward compatibility.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-cider
|
||||
(package
|
||||
(name "emacs-cider")
|
||||
(version "0.12.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/clojure-emacs/cider/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"00qzbfjy3w6bcnki7gw0clmi0cc5yqjdrcyhgv4ymijjs79h9p5s"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-clojure-mode" ,emacs-clojure-mode)
|
||||
("emacs-spinner" ,emacs-spinner)
|
||||
("emacs-pkg-info" ,emacs-pkg-info)
|
||||
("emacs-queue" ,emacs-queue)
|
||||
("emacs-seq" ,emacs-seq)))
|
||||
(home-page "https://cider.readthedocs.org/")
|
||||
(synopsis "Clojure development environment for Emacs")
|
||||
(description
|
||||
"CIDER (Clojure Interactive Development Environment that Rocks) aims to
|
||||
provide an interactive development experience similar to the one you'd get
|
||||
when programming in Emacs Lisp, Common Lisp (with SLIME or Sly), Scheme (with
|
||||
Geiser) and Smalltalk.
|
||||
|
||||
CIDER is the successor to the now deprecated combination of using SLIME +
|
||||
swank-clojure for Clojure development.
|
||||
|
||||
There are plenty of differences between CIDER and SLIME, but the core ideas
|
||||
are pretty much the same (and SLIME served as the principle inspiration for
|
||||
CIDER).")
|
||||
(license license:gpl3+)))
|
||||
|
|
|
@ -52,13 +52,13 @@ (define-module (gnu packages engineering)
|
|||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages tcl)
|
||||
#:use-module (gnu packages texlive)
|
||||
#:use-module (gnu packages tex)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
(define-public librecad
|
||||
(package
|
||||
(name "librecad")
|
||||
(version "2.0.9")
|
||||
(version "2.0.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -67,7 +67,7 @@ (define-public librecad
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xyn4ps9ia94h0vg53rsww8xfd1bgp4200phl8ihyhv7w5v4d8d0"))))
|
||||
"0jda23qspziph6fwgq1q3nmnllbgn9kwfpjylv1f0wa7c5l85gh5"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
|
@ -54,7 +54,7 @@ (define-module (gnu packages enlightenment)
|
|||
(define-public efl
|
||||
(package
|
||||
(name "efl")
|
||||
(version "1.17.0")
|
||||
(version "1.17.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -62,7 +62,7 @@ (define-public efl
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zisnz4x54mn9sm46kcr571faqnazkcglyf0lbz19l34syx40df1"))))
|
||||
"0d58bhvwg7c5hp07wywlwnqi01k4jhmpgac7gkx9lil1x6kmahqs"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -137,7 +137,7 @@ (define-public efl
|
|||
(define-public elementary
|
||||
(package
|
||||
(name "elementary")
|
||||
(version "1.17.0")
|
||||
(version "1.17.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -145,7 +145,7 @@ (define-public elementary
|
|||
"elementary/elementary-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0avb0d6nk4d88l81c2j6py13vdfnvg080ycw2y3qvawyjf1mhska"))))
|
||||
"149xjq4z71l44w1kd8zks9b2g0wjc9656w46hzd27b58afj1dqc5"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -273,7 +273,7 @@ (define-public rage
|
|||
(define-public enlightenment
|
||||
(package
|
||||
(name "enlightenment")
|
||||
(version "0.20.6")
|
||||
(version "0.20.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -281,7 +281,7 @@ (define-public enlightenment
|
|||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"11ahll68nlci214ka05whp5l32hy9lznmcdfqx3hxsmq2p7bl7zj"))))
|
||||
"17fi3frq4a73i0x7v7244g9m0fbjfamw0cfb4zhqs2rp1z8nq1iy"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--enable-mount-eeze")))
|
||||
|
|
|
@ -158,7 +158,7 @@ (define-public ledger
|
|||
("tzdata" ,tzdata)
|
||||
("utfcpp" ,utfcpp)))
|
||||
(native-inputs
|
||||
`(("emacs" ,emacs-no-x)
|
||||
`(("emacs" ,emacs-minimal)
|
||||
("groff" ,groff)
|
||||
("texinfo" ,texinfo)))
|
||||
(home-page "http://ledger-cli.org/")
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -30,6 +32,7 @@ (define-module (gnu packages flashing-tools)
|
|||
#:use-module (gnu packages libusb)
|
||||
#:use-module (gnu packages libftdi)
|
||||
#:use-module (gnu packages pciutils)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages admin))
|
||||
|
||||
(define-public flashrom
|
||||
|
@ -130,3 +133,30 @@ (define-public dfu-programmer
|
|||
Atmel (8051, AVR, XMEGA & AVR32) chips with a USB bootloader supporting
|
||||
ISP.")
|
||||
(license gpl2+)))
|
||||
|
||||
(define-public dfu-util
|
||||
(package
|
||||
(name "dfu-util")
|
||||
(version "0.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://dfu-util.sourceforge.net/releases/dfu-util-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0czq73m92ngf30asdzrfkzraag95hlrr74imbanqq25kdim8qhin"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libusb" ,libusb)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(synopsis "Host side of the USB Device Firmware Upgrade (DFU) protocol")
|
||||
(description
|
||||
"The DFU (Universal Serial Bus Device Firmware Upgrade) protocol is
|
||||
intended to download and upload firmware to devices connected over USB. It
|
||||
ranges from small devices like micro-controller boards up to mobile phones.
|
||||
With dfu-util you are able to download firmware to your device or upload
|
||||
firmware from it.")
|
||||
(home-page "http://dfu-util.sourceforge.net/")
|
||||
(license gpl2+)))
|
||||
|
|
|
@ -281,9 +281,16 @@ (define-public t1lib
|
|||
(version "5.1.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri "ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-5.1.2.tar.gz")
|
||||
(uri (list (string-append "ftp://sunsite.unc.edu/pub/Linux/libs/"
|
||||
"graphics/" name "-" version ".tar.gz")
|
||||
(string-append "https://fossies.org/linux/misc/old/"
|
||||
name "-" version ".tar.gz")))
|
||||
(sha256 (base32
|
||||
"0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2"))))
|
||||
"0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2"))
|
||||
(patches (search-patches
|
||||
"t1lib-CVE-2010-2642.patch"
|
||||
"t1lib-CVE-2011-0764.patch"
|
||||
"t1lib-CVE-2011-1552+CVE-2011-1553+CVE-2011-1554.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; Making the documentation requires latex, but t1lib is also an input
|
||||
|
@ -386,7 +393,7 @@ (define-public graphite2
|
|||
(define-public potrace
|
||||
(package
|
||||
(name "potrace")
|
||||
(version "1.11")
|
||||
(version "1.13")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -394,7 +401,7 @@ (define-public potrace
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bbyl7jgigawmwc8r14znv8lb6lrcxh8zpvynrl6s800dr4yp9as"))))
|
||||
"115p2vgyq7p2mf4nidk2x3aa341nvv2v8ml056vbji36df5l6lk2"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("ghostscript" ,ghostscript))) ;for tests
|
||||
(inputs `(("zlib" ,zlib)))
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -28,14 +28,14 @@ (define-module (gnu packages freeipmi)
|
|||
(define-public freeipmi
|
||||
(package
|
||||
(name "freeipmi")
|
||||
(version "1.5.1")
|
||||
(version "1.5.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/freeipmi/freeipmi-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0lhjxlha4j5rx11d81y1rgp9j18rlpxsjc0flsmj6bm60awmm627"))))
|
||||
"0xgfwk6lxwwzq8pbyxjl5xxpybs9p4qwgb7q0ykf048xwxha4kvk"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("readline" ,readline) ("libgcrypt" ,libgcrypt)))
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com>
|
||||
;;; Copyright © 2014 Sylvain Beucler <beuc@beuc.net>
|
||||
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014, 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2014, 2015, 2016 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
|
||||
|
@ -590,11 +590,11 @@ (define-public mars
|
|||
;; The latest release on SourceForge relies on an unreleased version of SFML
|
||||
;; with a different API, so we take the latest version from the official
|
||||
;; repository on Github.
|
||||
(let ((commit "c855d04409")
|
||||
(let ((commit "c855d044094a1d92317e38935d81ba938946132e")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "mars")
|
||||
(version (string-append "0.7.5." revision "." commit ))
|
||||
(version (string-append "0.7.5." revision "." (string-take commit 7) ))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -856,7 +856,7 @@ (define-public fizmo
|
|||
(define-public retroarch
|
||||
(package
|
||||
(name "retroarch")
|
||||
(version "1.3.1")
|
||||
(version "1.3.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -864,7 +864,7 @@ (define-public retroarch
|
|||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1wydzvligyby05x8c4lpg6xcnw9qkmvkskyhzc28xq10vm3q57fv"))))
|
||||
(base32 "077v1sj000y3csjw9vradba3k2aknvg5k8521z8aya6q987klwx5"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no tests
|
||||
|
@ -1833,6 +1833,7 @@ (define-public nestopia-ue
|
|||
(license license:gpl2+)))
|
||||
|
||||
(define-public emulation-station
|
||||
(let ((commit "646bede3d9ec0acf0ae378415edac136774a66c5"))
|
||||
(package
|
||||
(name "emulation-station")
|
||||
(version "2.0.1")
|
||||
|
@ -1840,7 +1841,7 @@ (define-public emulation-station
|
|||
(method git-fetch) ; no tarball available
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Aloshi/EmulationStation.git")
|
||||
(commit "646bede"))) ; no version tag
|
||||
(commit commit))) ; no version tag
|
||||
(sha256
|
||||
(base32
|
||||
"0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v"))))
|
||||
|
@ -1862,7 +1863,7 @@ (define-public emulation-station
|
|||
usable with any game controller that has at least 4 buttons, theming support,
|
||||
and a game metadata scraper.")
|
||||
(home-page "http://www.emulationstation.org")
|
||||
(license license:expat)))
|
||||
(license license:expat))))
|
||||
|
||||
(define openttd-engine
|
||||
(package
|
||||
|
|
|
@ -37,20 +37,19 @@ (define-public gd
|
|||
(package
|
||||
(name "gd")
|
||||
|
||||
;; Note: With libgd.org now pointing to bitbucket.org, genuine old
|
||||
;; Note: With libgd.org now pointing to github.com, genuine old
|
||||
;; tarballs are no longer available. Notably, versions 2.0.x are
|
||||
;; missing.
|
||||
(version "2.1.1")
|
||||
(version "2.2.1")
|
||||
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://bitbucket.org/libgd/gd-libgd/downloads/"
|
||||
"libgd-" version ".tar.xz"))
|
||||
"https://github.com/libgd/libgd/releases/download/gd-"
|
||||
version "/libgd-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"11djy9flzxczphigqgp7fbbblbq35gqwwhn9xfcckawlapa1xnls"))
|
||||
(patches (search-patches "gd-CVE-2016-3074.patch"))))
|
||||
"0xmrqka1ggqgml84xbmkw1y0r0lg7qn657v5b1my8pry92p651vh"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
|
|
@ -37,14 +37,14 @@ (define-module (gnu packages gdb)
|
|||
(define-public gdb
|
||||
(package
|
||||
(name "gdb")
|
||||
(version "7.11")
|
||||
(version "7.11.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gdb/gdb-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hg5kwwdvi9b9nxzxfjnx8fx3gip75fqyvkp82xpf3b3rcb42hvs"))))
|
||||
"0w7wi1llznlqdqk2lmzygz2xylb2c9mh580s9i0rypkmwfj6s8g9"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; FIXME "make check" fails on single-processor systems.
|
||||
|
|
|
@ -28,7 +28,7 @@ (define-module (gnu packages gettext)
|
|||
#:use-module (guix build-system perl)
|
||||
#:use-module (gnu packages docbook)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages texlive)
|
||||
#:use-module (gnu packages tex)
|
||||
#:use-module (gnu packages xml))
|
||||
|
||||
;; Use that name to avoid clashes with Guile's 'gettext' procedure.
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -24,6 +25,7 @@ (define-module (gnu packages gimp)
|
|||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages algebra)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages glib)
|
||||
|
@ -75,7 +77,8 @@ (define-public gegl
|
|||
"/" name "-" version ".tar.bz2")))
|
||||
(sha256
|
||||
(base32
|
||||
"09nlv06li9nrn74ifpm7223mxpg0s7cii702z72cpbwrjh6nlbnz"))))
|
||||
"09nlv06li9nrn74ifpm7223mxpg0s7cii702z72cpbwrjh6nlbnz"))
|
||||
(patches (search-patches "gegl-CVE-2012-4433.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(;; More than just the one test disabled below now fails; disable them
|
||||
|
@ -121,14 +124,15 @@ (define-public gegl
|
|||
(define-public gimp
|
||||
(package
|
||||
(name "gimp")
|
||||
(version "2.8.14")
|
||||
(version "2.8.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.gimp.org/pub/gimp/v2.8/gimp-"
|
||||
version ".tar.bz2"))
|
||||
(uri (string-append "http://download.gimp.org/pub/gimp/v"
|
||||
(version-major+minor version)
|
||||
"/gimp-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bdj0l7a94jqhjnj40m9rqaf622wj905iximivb55iy98639aanq"))))
|
||||
"1dsgazia9hmab8cw3iis7s69dvqyfj5wga7ds7w2q5mms1xqbqwm"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"doc")) ;8 MiB of gtk-doc HTML
|
||||
|
|
|
@ -97,7 +97,7 @@ (define-module (gnu packages gnome)
|
|||
#:use-module (gnu packages geeqie)
|
||||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages texlive)
|
||||
#:use-module (gnu packages tex)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages webkit)
|
||||
|
@ -1787,6 +1787,39 @@ (define-public vte
|
|||
editors, IDEs, etc.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public vte-ng
|
||||
(package
|
||||
(inherit vte)
|
||||
(name "vte-ng")
|
||||
(version "0.44.1.b")
|
||||
(native-inputs
|
||||
`(("gtk-doc" ,gtk-doc)
|
||||
("gperf" ,gperf)
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)
|
||||
,@(package-native-inputs vte)))
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/thestinger/"
|
||||
name "/archive/" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1mhz4i1qkdlrs49vgm7nsrb60lry9v6wsgwsmji7fln1nyrp1pag"))))
|
||||
(arguments
|
||||
`(#:configure-flags '("CXXFLAGS=-Wformat=0")
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'bootstrap
|
||||
(lambda _
|
||||
(setenv "NOCONFIGURE" "true")
|
||||
(zero? (system* "sh" "autogen.sh")))))))
|
||||
(synopsis "Enhanced VTE terminal widget")
|
||||
(description
|
||||
"VTE is a library (libvte) implementing a terminal emulator widget for
|
||||
GTK+, this fork provides additional functions exposed for keyboard text
|
||||
selection and URL hints.")))
|
||||
|
||||
;; provides vte 2.90, required for some terminal emulators
|
||||
;; tilda bug: https://github.com/lanoxx/tilda/issues/94
|
||||
;; pantheon-terminal bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788021
|
||||
|
@ -1820,7 +1853,10 @@ (define-public vte/gtk+-2
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bmhahkf8wdsra9whd3k5l5z4rv7r58ksr8mshzajgq2ma0hpkw6"))))
|
||||
"1bmhahkf8wdsra9whd3k5l5z4rv7r58ksr8mshzajgq2ma0hpkw6"))
|
||||
(patches (search-patches
|
||||
"vte-CVE-2012-2738-pt1.patch"
|
||||
"vte-CVE-2012-2738-pt2.patch"))))
|
||||
(arguments
|
||||
'(#:configure-flags '("--disable-python")))
|
||||
(native-inputs
|
||||
|
|
|
@ -266,10 +266,10 @@ (define-public gnunet
|
|||
(home-page "https://gnunet.org/")))
|
||||
|
||||
(define-public guile-gnunet ;GSoC 2015!
|
||||
(let ((commit "383eac2"))
|
||||
(let ((commit "383eac2aab175d8d9ea5315c2f1c8a5055c76a52"))
|
||||
(package
|
||||
(name "guile-gnunet")
|
||||
(version (string-append "0.0." commit))
|
||||
(version (string-append "0.0." (string-take commit 7)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
|
@ -448,6 +448,8 @@ (define-public icecat
|
|||
)
|
||||
|
||||
#:modules ((ice-9 ftw)
|
||||
(ice-9 rdelim)
|
||||
(ice-9 match)
|
||||
,@%gnu-build-system-modules)
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
@ -509,7 +511,48 @@ (define-public icecat
|
|||
(format #t "configure flags: ~s~%" flags)
|
||||
(zero? (apply system* bash
|
||||
(string-append srcdir "/configure")
|
||||
flags))))))))
|
||||
flags)))))
|
||||
(add-before 'configure 'install-desktop-entry
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Install the '.desktop' file.
|
||||
(define (swallow-%%-directives input output)
|
||||
;; Interpret '%%ifdef' directives found in the '.desktop' file.
|
||||
(let loop ((state 'top))
|
||||
(match (read-line input 'concat)
|
||||
((? eof-object?)
|
||||
#t)
|
||||
((? string? line)
|
||||
(cond ((string-prefix? "%%ifdef" line)
|
||||
(loop 'ifdef))
|
||||
((string-prefix? "%%else" line)
|
||||
(loop 'else))
|
||||
((string-prefix? "%%endif" line)
|
||||
(loop 'top))
|
||||
(else
|
||||
(case state
|
||||
((top else)
|
||||
(display line output)
|
||||
(loop state))
|
||||
(else
|
||||
(loop state)))))))))
|
||||
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(applications (string-append out "/share/applications")))
|
||||
(call-with-input-file "debian/icecat.desktop.in"
|
||||
(lambda (input)
|
||||
(call-with-output-file "debian/icecat.desktop"
|
||||
(lambda (output)
|
||||
(swallow-%%-directives input output)))))
|
||||
|
||||
(substitute* "debian/icecat.desktop"
|
||||
(("@MOZ_DISPLAY_NAME@")
|
||||
"GNU IceCat")
|
||||
(("^Exec=@MOZ_APP_NAME@")
|
||||
(string-append "Exec=" out "/bin/icecat"))
|
||||
(("@MOZ_APP_NAME@")
|
||||
"icecat"))
|
||||
(install-file "debian/icecat.desktop" applications)
|
||||
#t))))))
|
||||
(home-page "http://www.gnu.org/software/gnuzilla/")
|
||||
(synopsis "Entirely free browser derived from Mozilla Firefox")
|
||||
(description
|
||||
|
|
|
@ -38,7 +38,10 @@ (define-public gprolog
|
|||
"13miyas47bmijmadm68cbvb21n4s156gjafz7kfx9brk9djfkh0q"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases (alist-cons-before
|
||||
`(#:configure-flags
|
||||
(list (string-append
|
||||
"--with-install-dir=" %output "/share/gprolog"))
|
||||
#:phases (alist-cons-before
|
||||
'configure 'change-dir-n-fix-shells
|
||||
(lambda _
|
||||
(chdir "src")
|
||||
|
|
|
@ -25,6 +25,7 @@ (define-module (gnu packages grub)
|
|||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages disk)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages fontutils)
|
||||
|
@ -99,11 +100,6 @@ (define-public grub
|
|||
;; Make the font visible.
|
||||
(copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
|
||||
(system* "gunzip" "unifont.bdf.gz")
|
||||
|
||||
;; TODO: Re-enable this test when we have Parted.
|
||||
(substitute* "tests/partmap_test.in"
|
||||
(("set -e") "exit 77"))
|
||||
|
||||
#t)))))
|
||||
(inputs
|
||||
`(;; ("lvm2" ,lvm2)
|
||||
|
@ -121,6 +117,7 @@ (define-public grub
|
|||
|
||||
;; Dependencies for the test suite. The "real" QEMU is needed here,
|
||||
;; because several targets are used.
|
||||
("parted" ,parted)
|
||||
("qemu" ,qemu-for-tests)
|
||||
("xorriso" ,xorriso)))
|
||||
(home-page "http://www.gnu.org/software/grub/")
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
|
||||
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
|
||||
;;; Copyright © 2016 Patrick Hetu <patrick.hetu@auf.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -51,6 +52,7 @@ (define-module (gnu packages gtk)
|
|||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages libffi)
|
||||
#:use-module (gnu packages pdf)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
|
@ -822,6 +824,60 @@ (define-public guile-present
|
|||
documents.")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public guile-gnome
|
||||
(package
|
||||
(name "guile-gnome")
|
||||
(version "2.16.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append "mirror://gnu/" name
|
||||
"/guile-gnome-platform/guile-gnome-platform-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hqnqbb2lmr3hgbcv9kds1himn3av6h0lkk0zll8agcrsn7d9axd"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("atk" ,atk)
|
||||
;;("corba" ,corba) ; not packaged yet
|
||||
("gconf" ,gconf)
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
;;("gthread" ,gthread) ; not packaged yet
|
||||
("gnome-vfs" ,gnome-vfs)
|
||||
("gdk-pixbuf" ,gdk-pixbuf)
|
||||
("gtk+" ,gtk+-2)
|
||||
("libglade" ,libglade)
|
||||
("libgnome" ,libgnome)
|
||||
("libgnomecanvas" ,libgnomecanvas)
|
||||
("libgnomeui" ,libgnomeui)
|
||||
("pango" ,pango)
|
||||
("libffi" ,libffi)
|
||||
("glib" ,glib)))
|
||||
(inputs `(("guile" ,guile-2.0)))
|
||||
(propagated-inputs
|
||||
`(("guile-cairo" ,guile-cairo)
|
||||
("g-wrap" ,g-wrap)
|
||||
("guile-lib" ,guile-lib)))
|
||||
(arguments
|
||||
`(#:tests? #f ;FIXME
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'configure 'pre-configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(substitute* (find-files "." "^Makefile.in$")
|
||||
(("guilesite :=.*guile/site" all)
|
||||
(string-append all "/2.0")))
|
||||
#t))))))
|
||||
(outputs '("out" "debug"))
|
||||
(synopsis "Guile interface for GTK+ programming for GNOME")
|
||||
(description
|
||||
"Includes guile-clutter, guile-gnome-gstreamer,
|
||||
guile-gnome-platform (GNOME developer libraries), and guile-gtksourceview.")
|
||||
(home-page "http://www.gnu.org/software/guile-gnome/")
|
||||
(license license:gpl2+)))
|
||||
|
||||
;;;
|
||||
;;; C++ bindings.
|
||||
;;;
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
|
||||
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -731,6 +732,28 @@ (define-public ghc-cmdargs
|
|||
"This library provides an easy way to define command line parsers.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-concatenative
|
||||
(package
|
||||
(name "ghc-concatenative")
|
||||
(version "1.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://hackage.haskell.org/package/concatenative/concatenative-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd"))))
|
||||
(build-system haskell-build-system)
|
||||
(home-page
|
||||
"https://patch-tag.com/r/salazar/concatenative/snapshot/current/content/pretty")
|
||||
(synopsis "Library for postfix control flow")
|
||||
(description
|
||||
"Concatenative gives Haskell Factor-style combinators and arrows for
|
||||
postfix notation. For more information on stack based languages, see
|
||||
@uref{http://concatenative.org}.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-happy
|
||||
(package
|
||||
(name "ghc-happy")
|
||||
|
@ -1979,6 +2002,31 @@ (define-public ghc-http-types
|
|||
both client and server code).")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-indents
|
||||
(package
|
||||
(name "ghc-indents")
|
||||
(version "0.3.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://hackage.haskell.org/package/indents/indents-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-parsec" ,ghc-parsec)
|
||||
("ghc-concatenative" ,ghc-concatenative)
|
||||
("ghc-mtl" ,ghc-mtl)))
|
||||
(home-page "http://patch-tag.com/r/salazar/indents")
|
||||
(synopsis "Indentation sensitive parser-combinators for parsec")
|
||||
(description
|
||||
"This library provides functions for use in parsing indentation sensitive
|
||||
contexts. It parses blocks of lines all indented to the same level as well as
|
||||
lines continued at an indented level below.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-iproute
|
||||
(package
|
||||
(name "ghc-iproute")
|
||||
|
@ -3150,6 +3198,27 @@ (define-public ghc-annotated-wl-pprint
|
|||
a variety of ways.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-wl-pprint
|
||||
(package
|
||||
(name "ghc-wl-pprint")
|
||||
(version "1.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://hackage.haskell.org/package/wl-pprint/wl-pprint-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r"))))
|
||||
(build-system haskell-build-system)
|
||||
(home-page "http://hackage.haskell.org/package/wl-pprint")
|
||||
(synopsis "Wadler/Leijen pretty printer")
|
||||
(description
|
||||
"This is a pretty printing library based on Wadler's paper @i{A Prettier
|
||||
Printer}. This version allows the library user to declare overlapping
|
||||
instances of the @code{Pretty} class.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-ansi-wl-pprint
|
||||
(package
|
||||
(name "ghc-ansi-wl-pprint")
|
||||
|
@ -4856,6 +4925,39 @@ (define-public ghc-aeson
|
|||
naming: in Greek mythology, Aeson was the father of Jason.)")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-aeson-pretty
|
||||
(package
|
||||
(name "ghc-aeson-pretty")
|
||||
(version "0.7.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://hackage.haskell.org/package/aeson-pretty/aeson-pretty-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03ap81853qi8yd9kdgczllrrni23a6glsfxrwj8zab6ipjrbh234"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-aeson" ,ghc-aeson)
|
||||
("ghc-vector" ,ghc-vector)
|
||||
("ghc-text" ,ghc-text)
|
||||
("ghc-unordered-containers"
|
||||
,ghc-unordered-containers)
|
||||
("ghc-attoparsec" ,ghc-attoparsec)
|
||||
("ghc-cmdargs" ,ghc-cmdargs)))
|
||||
(home-page "http://github.com/informatikr/aeson-pretty")
|
||||
(synopsis "JSON pretty-printing library and command-line tool")
|
||||
(description
|
||||
"This package provides a JSON pretty-printing library compatible with aeson
|
||||
as well as a command-line tool to improve readabilty of streams of JSON data.
|
||||
The library provides the function @code{encodePretty}. It is a drop-in
|
||||
replacement for aeson's @code{encode} function, producing JSON-ByteStrings for
|
||||
human readers. The command-line tool reads JSON from stdin and writes
|
||||
prettified JSON to stdout. It also offers a complementary \"compact\"-mode,
|
||||
essentially the opposite of pretty-printing.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ghc-wai
|
||||
(package
|
||||
(name "ghc-wai")
|
||||
|
@ -6242,6 +6344,31 @@ (define-public ghc-pandoc
|
|||
provided for those who need a drop-in replacement for Markdown.pl.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public ghc-union-find
|
||||
(package
|
||||
(name "ghc-union-find")
|
||||
(version "0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://hackage.haskell.org/package/union-find/union-find-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6"))))
|
||||
(build-system haskell-build-system)
|
||||
(home-page "http://github.com/nominolo/union-find")
|
||||
(synopsis "Efficient union and equivalence testing of sets")
|
||||
(description
|
||||
"The Union/Find algorithm implements these operations in (effectively)
|
||||
constant-time:
|
||||
@enumerate
|
||||
@item Check whether two elements are in the same equivalence class.
|
||||
@item Create a union of two equivalence classes.
|
||||
@item Look up the descriptor of the equivalence class.
|
||||
@end enumerate\n")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public idris
|
||||
(package
|
||||
(name "idris")
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2014, 2015, 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -22,6 +22,7 @@ (define-module (gnu packages hurd)
|
|||
#:use-module (guix packages)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages perl)
|
||||
|
@ -185,3 +186,28 @@ (define-public hurd-minimal
|
|||
"This package provides libihash, needed to build the GNU C
|
||||
Library for GNU/Hurd.")
|
||||
(license gpl2+)))
|
||||
|
||||
(define-public hurd-core-headers
|
||||
(package
|
||||
(name "hurd-core-headers")
|
||||
(version (package-version hurd-headers))
|
||||
(source #f)
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
'(#:modules ((guix build union))
|
||||
#:builder (begin
|
||||
(use-modules (ice-9 match)
|
||||
(guix build union))
|
||||
(match %build-inputs
|
||||
(((names . directories) ...)
|
||||
(union-build (assoc-ref %outputs "out")
|
||||
directories))))))
|
||||
(inputs `(("gnumach-headers" ,gnumach-headers)
|
||||
("hurd-headers" ,hurd-headers)
|
||||
("hurd-minimal" ,hurd-minimal)))
|
||||
(synopsis "Union of the Hurd headers and libraries")
|
||||
(description
|
||||
"This package contains the union of the Mach and Hurd headers and the
|
||||
Hurd-minimal package which are needed for both glibc and GCC.")
|
||||
(home-page (package-home-page hurd-headers))
|
||||
(license (package-license hurd-headers))))
|
||||
|
|
|
@ -37,7 +37,7 @@ (define-public idutils
|
|||
"1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1"))
|
||||
(patches (search-patches "diffutils-gets-undeclared.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("emacs" ,emacs-no-x)))
|
||||
(native-inputs `(("emacs" ,emacs-minimal)))
|
||||
(home-page "http://www.gnu.org/software/idutils/")
|
||||
(synopsis "Identifier database utilities")
|
||||
(description
|
||||
|
|
|
@ -693,7 +693,8 @@ (define-public devil
|
|||
"1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"))
|
||||
;; Backported from upstream:
|
||||
;; https://github.com/DentonW/DevIL/commit/724194d7a9a91221a564579f64bdd6f0abd64219.patch
|
||||
(patches (search-patches "devil-fix-libpng.patch"))
|
||||
(patches (search-patches "devil-fix-libpng.patch"
|
||||
"devil-CVE-2009-3994.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Fix old lcms include directives and lib flags.
|
||||
|
@ -766,3 +767,37 @@ (define-public jasper
|
|||
ISO/IEC 15444-1).")
|
||||
(home-page "https://www.ece.uvic.ca/~frodo/jasper/")
|
||||
(license (license:x11-style "file://LICENSE"))))
|
||||
|
||||
(define-public zimg
|
||||
(package
|
||||
(name "zimg")
|
||||
(version "2.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/sekrit-twc/zimg/archive/"
|
||||
"release-" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hqp1gcsa2zhypms5dnasb1srjgxdqm7cip3w5i571kk9nxkn289"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)))
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'autogen
|
||||
(lambda _
|
||||
(zero? (system* "sh" "autogen.sh")))))))
|
||||
(synopsis "Scaling, colorspace conversion, and dithering library")
|
||||
(description "Zimg implements the commonly required image processing basics
|
||||
of scaling, colorspace conversion, and depth conversion. A simple API enables
|
||||
conversion between any supported formats to operate with minimal knowledge from
|
||||
the programmer.")
|
||||
(home-page "https://github.com/sekrit-twc/zimg")
|
||||
;; test/extra/ contains musl-libm,
|
||||
;; which is MIT/expat licensed, but only used for tests
|
||||
(license (license:fsf-free "file://COPYING")))) ;WTFPL version 2
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -40,14 +41,14 @@ (define-module (gnu packages imagemagick)
|
|||
(define-public imagemagick
|
||||
(package
|
||||
(name "imagemagick")
|
||||
(version "6.9.4-4")
|
||||
(version "6.9.4-7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://imagemagick/ImageMagick-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"005nnp0masv59yfcdip6qld86567zjbz59c9lkcqrxclm27vmx0p"))))
|
||||
"11jcbc9phx37m7ra4v3qsfa2iqh3srsvxplxz38h911jvgfchkzm"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-frozenpaths")
|
||||
|
@ -154,7 +155,7 @@ (define-public perl-image-magick
|
|||
(define-public graphicsmagick
|
||||
(package
|
||||
(name "graphicsmagick")
|
||||
(version "1.3.23")
|
||||
(version "1.3.24")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://ftp.graphicsmagick.org/pub/"
|
||||
|
@ -162,7 +163,7 @@ (define-public graphicsmagick
|
|||
"/GraphicsMagick-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03g6l2h8cmf231y1vma0z7x85070jm1ysgs9ppqcd3jj56jka9gx"))))
|
||||
"1q40w5hcl8rcpszm0r7rpr3a9lj390p39zfvavkvlgxyyk7bmgsj"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
@ -181,15 +181,16 @@ (define-public ant
|
|||
(define-public icedtea-6
|
||||
(package
|
||||
(name "icedtea")
|
||||
(version "1.13.10")
|
||||
(version "1.13.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://icedtea.wildebeest.org/download/source/icedtea6-"
|
||||
version ".tar.xz"))
|
||||
(patches (search-patches "icedtea-remove-overrides.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1mq08sfyfjlfw0c1czjs47303zv4h91s1jc0nhdlra4rbbx0g2d0"))
|
||||
"1grki39a4rf8n74zc0iglcggxxbpniyfh1gk1lb10p63zvvcsvjj"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(substitute* "Makefile.in"
|
||||
|
@ -539,6 +540,7 @@ (define-public icedtea-6
|
|||
("mit-krb5" ,mit-krb5)
|
||||
("nss" ,nss)
|
||||
("libx11" ,libx11)
|
||||
("libxcomposite" ,libxcomposite)
|
||||
("libxt" ,libxt)
|
||||
("libxtst" ,libxtst)
|
||||
("libxi" ,libxi)
|
||||
|
@ -552,10 +554,10 @@ (define-public icedtea-6
|
|||
("openjdk6-src"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri "https://java.net/downloads/openjdk6/openjdk-6-src-b38-20_jan_2016.tar.gz")
|
||||
(uri "https://java.net/downloads/openjdk6/openjdk-6-src-b39-03_may_2016.tar.gz")
|
||||
(sha256
|
||||
(base32
|
||||
"1fapj9w4ahzf5nwvdgi1dsxjyh9dqbcvf9638r60h1by13wjqk5p"))))
|
||||
"1brxbsgwcj4js26y5lk6capc3pvghgjidvv9cavw6z8n7c7aw8af"))))
|
||||
("lcms" ,lcms)
|
||||
("zlib" ,zlib)
|
||||
("gtk" ,gtk+-2)
|
||||
|
|
|
@ -43,8 +43,8 @@ (define-module (gnu packages julia)
|
|||
#:use-module (ice-9 match))
|
||||
|
||||
(define libuv-julia
|
||||
(let ((commit "07730c4bd595b4d45a498a8ee0bcd53878ff7c10")
|
||||
(revision "2"))
|
||||
(let ((commit "efb40768b7c7bd9f173a7868f74b92b1c5a61a0e")
|
||||
(revision "3"))
|
||||
(package (inherit libuv)
|
||||
(name "libuv-julia")
|
||||
(version (string-append "0.11.26." revision "-" (string-take commit 8)))
|
||||
|
@ -56,7 +56,7 @@ (define libuv-julia
|
|||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"1r0d4wb41w8k3bi9sjr7kapk1ag131ss2fbqa4jz4gnrzvw94sqx"))))
|
||||
"16k6pm2jl0ymz5j4ldxn94imdimahqqfd2izgr3zf1vwyyay77w3"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments libuv)
|
||||
|
@ -68,7 +68,7 @@ (define libuv-julia
|
|||
(define-public julia
|
||||
(package
|
||||
(name "julia")
|
||||
(version "0.4.3")
|
||||
(version "0.4.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -76,7 +76,7 @@ (define-public julia
|
|||
version "/julia-" version "-full.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1i8k847d8n9v37xg69grpl51dysx36p0phwf0d1qxpsqixdg579b"))))
|
||||
"1nbi78fav5f4zj5332iwm4mfk0qhd5qh61z881q69rvp7b163wyb"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.5.0-gnu Kernel Configuration
|
||||
# Linux/x86 4.6.0-gnu Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
|
@ -40,6 +40,7 @@ CONFIG_X86_32_SMP=y
|
|||
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
|
||||
CONFIG_ARCH_SUPPORTS_UPROBES=y
|
||||
CONFIG_FIX_EARLYCON_MEM=y
|
||||
CONFIG_DEBUG_RODATA=y
|
||||
CONFIG_PGTABLE_LEVELS=3
|
||||
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
|
||||
CONFIG_IRQ_WORK=y
|
||||
|
@ -195,6 +196,8 @@ CONFIG_SYSFS_SYSCALL=y
|
|||
CONFIG_SYSCTL_SYSCALL=y
|
||||
CONFIG_KALLSYMS=y
|
||||
CONFIG_KALLSYMS_ALL=y
|
||||
# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
|
||||
CONFIG_KALLSYMS_BASE_RELATIVE=y
|
||||
CONFIG_PRINTK=y
|
||||
CONFIG_BUG=y
|
||||
CONFIG_ELF_CORE=y
|
||||
|
@ -378,6 +381,7 @@ CONFIG_X86_FEATURE_NAMES=y
|
|||
CONFIG_X86_FAST_FEATURE_TESTS=y
|
||||
CONFIG_X86_MPPARSE=y
|
||||
# CONFIG_X86_BIGSMP is not set
|
||||
# CONFIG_GOLDFISH is not set
|
||||
CONFIG_X86_EXTENDED_PLATFORM=y
|
||||
# CONFIG_X86_GOLDFISH is not set
|
||||
CONFIG_X86_INTEL_MID=y
|
||||
|
@ -481,6 +485,7 @@ CONFIG_MICROCODE=y
|
|||
CONFIG_MICROCODE_INTEL=y
|
||||
CONFIG_MICROCODE_AMD=y
|
||||
CONFIG_MICROCODE_OLD_INTERFACE=y
|
||||
CONFIG_PERF_EVENTS_AMD_POWER=m
|
||||
CONFIG_X86_MSR=m
|
||||
CONFIG_X86_CPUID=m
|
||||
# CONFIG_NOHIGHMEM is not set
|
||||
|
@ -765,10 +770,21 @@ CONFIG_PCI_IOV=y
|
|||
CONFIG_PCI_PRI=y
|
||||
CONFIG_PCI_PASID=y
|
||||
CONFIG_PCI_LABEL=y
|
||||
CONFIG_HOTPLUG_PCI=y
|
||||
CONFIG_HOTPLUG_PCI_COMPAQ=m
|
||||
CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
|
||||
CONFIG_HOTPLUG_PCI_IBM=m
|
||||
CONFIG_HOTPLUG_PCI_ACPI=y
|
||||
CONFIG_HOTPLUG_PCI_ACPI_IBM=m
|
||||
CONFIG_HOTPLUG_PCI_CPCI=y
|
||||
CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
|
||||
CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
|
||||
CONFIG_HOTPLUG_PCI_SHPC=m
|
||||
|
||||
#
|
||||
# PCI host controller drivers
|
||||
#
|
||||
# CONFIG_PCIE_DW_PLAT is not set
|
||||
CONFIG_ISA_DMA_API=y
|
||||
CONFIG_ISA=y
|
||||
CONFIG_EISA=y
|
||||
|
@ -802,16 +818,6 @@ CONFIG_I82365=m
|
|||
CONFIG_TCIC=m
|
||||
CONFIG_PCMCIA_PROBE=y
|
||||
CONFIG_PCCARD_NONSTATIC=y
|
||||
CONFIG_HOTPLUG_PCI=y
|
||||
CONFIG_HOTPLUG_PCI_COMPAQ=m
|
||||
CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
|
||||
CONFIG_HOTPLUG_PCI_IBM=m
|
||||
CONFIG_HOTPLUG_PCI_ACPI=y
|
||||
CONFIG_HOTPLUG_PCI_ACPI_IBM=m
|
||||
CONFIG_HOTPLUG_PCI_CPCI=y
|
||||
CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
|
||||
CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
|
||||
CONFIG_HOTPLUG_PCI_SHPC=m
|
||||
CONFIG_RAPIDIO=y
|
||||
CONFIG_RAPIDIO_TSI721=m
|
||||
CONFIG_RAPIDIO_DISC_TIMEOUT=30
|
||||
|
@ -819,6 +825,7 @@ CONFIG_RAPIDIO_DISC_TIMEOUT=30
|
|||
CONFIG_RAPIDIO_DMA_ENGINE=y
|
||||
# CONFIG_RAPIDIO_DEBUG is not set
|
||||
CONFIG_RAPIDIO_ENUM_BASIC=m
|
||||
CONFIG_RAPIDIO_MPORT_CDEV=m
|
||||
|
||||
#
|
||||
# RapidIO Switch drivers
|
||||
|
@ -896,7 +903,6 @@ CONFIG_INET_TUNNEL=m
|
|||
CONFIG_INET_XFRM_MODE_TRANSPORT=m
|
||||
CONFIG_INET_XFRM_MODE_TUNNEL=m
|
||||
CONFIG_INET_XFRM_MODE_BEET=m
|
||||
CONFIG_INET_LRO=y
|
||||
CONFIG_INET_DIAG=m
|
||||
CONFIG_INET_TCP_DIAG=m
|
||||
CONFIG_INET_UDP_DIAG=m
|
||||
|
@ -1445,11 +1451,15 @@ CONFIG_NET_ACT_CSUM=m
|
|||
CONFIG_NET_ACT_VLAN=m
|
||||
CONFIG_NET_ACT_BPF=m
|
||||
CONFIG_NET_ACT_CONNMARK=m
|
||||
CONFIG_NET_ACT_IFE=m
|
||||
CONFIG_NET_IFE_SKBMARK=m
|
||||
CONFIG_NET_IFE_SKBPRIO=m
|
||||
# CONFIG_NET_CLS_IND is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
CONFIG_DCB=y
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
CONFIG_BATMAN_ADV=m
|
||||
# CONFIG_BATMAN_ADV_BATMAN_V is not set
|
||||
CONFIG_BATMAN_ADV_BLA=y
|
||||
CONFIG_BATMAN_ADV_DAT=y
|
||||
CONFIG_BATMAN_ADV_NC=y
|
||||
|
@ -1461,7 +1471,6 @@ CONFIG_OPENVSWITCH_VXLAN=m
|
|||
CONFIG_OPENVSWITCH_GENEVE=m
|
||||
CONFIG_VSOCKETS=m
|
||||
CONFIG_VMWARE_VMCI_VSOCKETS=m
|
||||
CONFIG_NETLINK_MMAP=y
|
||||
CONFIG_NETLINK_DIAG=m
|
||||
CONFIG_MPLS=y
|
||||
CONFIG_NET_MPLS_GSO=m
|
||||
|
@ -1525,6 +1534,14 @@ CONFIG_CAN_CALC_BITTIMING=y
|
|||
CONFIG_CAN_LEDS=y
|
||||
CONFIG_CAN_JANZ_ICAN3=m
|
||||
CONFIG_PCH_CAN=m
|
||||
CONFIG_CAN_C_CAN=m
|
||||
CONFIG_CAN_C_CAN_PLATFORM=m
|
||||
CONFIG_CAN_C_CAN_PCI=m
|
||||
CONFIG_CAN_CC770=m
|
||||
CONFIG_CAN_CC770_ISA=m
|
||||
CONFIG_CAN_CC770_PLATFORM=m
|
||||
CONFIG_CAN_IFI_CANFD=m
|
||||
CONFIG_CAN_M_CAN=m
|
||||
CONFIG_CAN_SJA1000=m
|
||||
CONFIG_CAN_SJA1000_ISA=m
|
||||
CONFIG_CAN_SJA1000_PLATFORM=m
|
||||
|
@ -1536,13 +1553,8 @@ CONFIG_CAN_PEAK_PCIEC=y
|
|||
CONFIG_CAN_KVASER_PCI=m
|
||||
CONFIG_CAN_PLX_PCI=m
|
||||
CONFIG_CAN_TSCAN1=m
|
||||
CONFIG_CAN_C_CAN=m
|
||||
CONFIG_CAN_C_CAN_PLATFORM=m
|
||||
CONFIG_CAN_C_CAN_PCI=m
|
||||
CONFIG_CAN_M_CAN=m
|
||||
CONFIG_CAN_CC770=m
|
||||
CONFIG_CAN_CC770_ISA=m
|
||||
CONFIG_CAN_CC770_PLATFORM=m
|
||||
CONFIG_CAN_SOFTING=m
|
||||
CONFIG_CAN_SOFTING_CS=m
|
||||
|
||||
#
|
||||
# CAN SPI interfaces
|
||||
|
@ -1558,8 +1570,6 @@ CONFIG_CAN_GS_USB=m
|
|||
CONFIG_CAN_KVASER_USB=m
|
||||
CONFIG_CAN_PEAK_USB=m
|
||||
CONFIG_CAN_8DEV_USB=m
|
||||
CONFIG_CAN_SOFTING=m
|
||||
CONFIG_CAN_SOFTING_CS=m
|
||||
# CONFIG_CAN_DEBUG_DEVICES is not set
|
||||
CONFIG_IRDA=m
|
||||
|
||||
|
@ -1630,6 +1640,7 @@ CONFIG_BT_HIDP=m
|
|||
CONFIG_BT_HS=y
|
||||
CONFIG_BT_LE=y
|
||||
CONFIG_BT_6LOWPAN=m
|
||||
# CONFIG_BT_LEDS is not set
|
||||
# CONFIG_BT_SELFTEST is not set
|
||||
CONFIG_BT_DEBUGFS=y
|
||||
|
||||
|
@ -1653,6 +1664,7 @@ CONFIG_BT_HCIUART_3WIRE=y
|
|||
CONFIG_BT_HCIUART_INTEL=y
|
||||
CONFIG_BT_HCIUART_BCM=y
|
||||
CONFIG_BT_HCIUART_QCA=y
|
||||
CONFIG_BT_HCIUART_AG6XX=y
|
||||
CONFIG_BT_HCIBCM203X=m
|
||||
CONFIG_BT_HCIBPA10X=m
|
||||
CONFIG_BT_HCIBFUSB=m
|
||||
|
@ -1668,6 +1680,7 @@ CONFIG_BT_WILINK=m
|
|||
CONFIG_AF_RXRPC=m
|
||||
# CONFIG_AF_RXRPC_DEBUG is not set
|
||||
CONFIG_RXKAD=m
|
||||
CONFIG_AF_KCM=m
|
||||
CONFIG_FIB_RULES=y
|
||||
CONFIG_WIRELESS=y
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
|
@ -1678,7 +1691,6 @@ CONFIG_WEXT_PRIV=y
|
|||
CONFIG_CFG80211=m
|
||||
# CONFIG_NL80211_TESTMODE is not set
|
||||
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
|
||||
# CONFIG_CFG80211_REG_DEBUG is not set
|
||||
# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
|
||||
CONFIG_CFG80211_DEFAULT_PS=y
|
||||
CONFIG_CFG80211_DEBUGFS=y
|
||||
|
@ -1763,6 +1775,9 @@ CONFIG_NFC_S3FWRN5=m
|
|||
CONFIG_NFC_S3FWRN5_I2C=m
|
||||
CONFIG_NFC_ST95HF=m
|
||||
CONFIG_LWTUNNEL=y
|
||||
CONFIG_DST_CACHE=y
|
||||
CONFIG_NET_DEVLINK=m
|
||||
CONFIG_MAY_USE_DEVLINK=m
|
||||
|
||||
#
|
||||
# Device Drivers
|
||||
|
@ -2031,6 +2046,7 @@ CONFIG_VIRTIO_BLK=y
|
|||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
CONFIG_BLK_DEV_RSXX=m
|
||||
CONFIG_NVME_CORE=m
|
||||
CONFIG_BLK_DEV_NVME=m
|
||||
# CONFIG_BLK_DEV_NVME_SCSI is not set
|
||||
|
||||
|
@ -2063,13 +2079,17 @@ CONFIG_HMC6352=m
|
|||
CONFIG_DS1682=m
|
||||
CONFIG_TI_DAC7512=m
|
||||
CONFIG_VMWARE_BALLOON=m
|
||||
CONFIG_BMP085=y
|
||||
CONFIG_BMP085=m
|
||||
CONFIG_BMP085_I2C=m
|
||||
CONFIG_BMP085_SPI=m
|
||||
CONFIG_PCH_PHUB=m
|
||||
CONFIG_USB_SWITCH_FSA9480=m
|
||||
CONFIG_LATTICE_ECP3_CONFIG=m
|
||||
CONFIG_SRAM=y
|
||||
CONFIG_PANEL=m
|
||||
CONFIG_PANEL_PARPORT=0
|
||||
CONFIG_PANEL_PROFILE=5
|
||||
# CONFIG_PANEL_CHANGE_MESSAGE is not set
|
||||
CONFIG_C2PORT=m
|
||||
CONFIG_C2PORT_DURAMAR_2150=m
|
||||
|
||||
|
@ -2109,6 +2129,10 @@ CONFIG_VMWARE_VMCI=m
|
|||
# SCIF Bus Driver
|
||||
#
|
||||
|
||||
#
|
||||
# VOP Bus Driver
|
||||
#
|
||||
|
||||
#
|
||||
# Intel MIC Host Driver
|
||||
#
|
||||
|
@ -2124,6 +2148,10 @@ CONFIG_VMWARE_VMCI=m
|
|||
#
|
||||
# Intel MIC Coprocessor State Management (COSM) Drivers
|
||||
#
|
||||
|
||||
#
|
||||
# VOP Driver
|
||||
#
|
||||
CONFIG_ECHO=m
|
||||
# CONFIG_CXL_BASE is not set
|
||||
# CONFIG_CXL_KERNEL_API is not set
|
||||
|
@ -2431,7 +2459,6 @@ CONFIG_DM_CRYPT=m
|
|||
CONFIG_DM_SNAPSHOT=m
|
||||
CONFIG_DM_THIN_PROVISIONING=m
|
||||
CONFIG_DM_CACHE=m
|
||||
CONFIG_DM_CACHE_MQ=m
|
||||
CONFIG_DM_CACHE_SMQ=m
|
||||
CONFIG_DM_CACHE_CLEANER=m
|
||||
CONFIG_DM_ERA=m
|
||||
|
@ -2496,6 +2523,7 @@ CONFIG_MACVTAP=m
|
|||
CONFIG_IPVLAN=m
|
||||
CONFIG_VXLAN=m
|
||||
CONFIG_GENEVE=m
|
||||
CONFIG_MACSEC=m
|
||||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETCONSOLE_DYNAMIC=y
|
||||
CONFIG_NETPOLL=y
|
||||
|
@ -2619,6 +2647,7 @@ CONFIG_TIGON3=m
|
|||
CONFIG_BNX2X=m
|
||||
CONFIG_BNX2X_SRIOV=y
|
||||
CONFIG_BNX2X_VXLAN=y
|
||||
# CONFIG_BNX2X_GENEVE is not set
|
||||
CONFIG_BNXT=m
|
||||
CONFIG_BNXT_SRIOV=y
|
||||
CONFIG_NET_VENDOR_BROCADE=y
|
||||
|
@ -2630,6 +2659,7 @@ CONFIG_CHELSIO_T1_1G=y
|
|||
CONFIG_CHELSIO_T3=m
|
||||
CONFIG_CHELSIO_T4=m
|
||||
CONFIG_CHELSIO_T4_DCB=y
|
||||
# CONFIG_CHELSIO_T4_UWIRE is not set
|
||||
CONFIG_CHELSIO_T4_FCOE=y
|
||||
CONFIG_CHELSIO_T4VF=m
|
||||
CONFIG_NET_VENDOR_CIRRUS=y
|
||||
|
@ -2673,6 +2703,7 @@ CONFIG_NET_VENDOR_INTEL=y
|
|||
CONFIG_E100=m
|
||||
CONFIG_E1000=m
|
||||
CONFIG_E1000E=m
|
||||
CONFIG_E1000E_HWTS=y
|
||||
CONFIG_IGB=m
|
||||
CONFIG_IGB_HWMON=y
|
||||
CONFIG_IGBVF=m
|
||||
|
@ -2694,6 +2725,7 @@ CONFIG_NET_VENDOR_I825XX=y
|
|||
CONFIG_JME=m
|
||||
CONFIG_NET_VENDOR_MARVELL=y
|
||||
CONFIG_MVMDIO=m
|
||||
# CONFIG_MVNETA_BM is not set
|
||||
CONFIG_SKGE=m
|
||||
# CONFIG_SKGE_DEBUG is not set
|
||||
CONFIG_SKGE_GENESIS=y
|
||||
|
@ -2707,6 +2739,8 @@ CONFIG_MLX4_CORE=m
|
|||
CONFIG_MLX4_DEBUG=y
|
||||
CONFIG_MLX5_CORE=m
|
||||
CONFIG_MLX5_CORE_EN=y
|
||||
CONFIG_MLX5_CORE_EN_DCB=y
|
||||
CONFIG_MLX5_CORE_EN_VXLAN=y
|
||||
CONFIG_MLXSW_CORE=m
|
||||
CONFIG_MLXSW_CORE_HWMON=y
|
||||
CONFIG_MLXSW_PCI=m
|
||||
|
@ -3041,6 +3075,7 @@ CONFIG_IWLMVM=m
|
|||
CONFIG_IWLWIFI_OPMODE_MODULAR=y
|
||||
# CONFIG_IWLWIFI_BCAST_FILTERING is not set
|
||||
# CONFIG_IWLWIFI_UAPSD is not set
|
||||
# CONFIG_IWLWIFI_PCIE_RTPM is not set
|
||||
|
||||
#
|
||||
# Debugging Options
|
||||
|
@ -3158,7 +3193,6 @@ CONFIG_WL1251_SDIO=m
|
|||
CONFIG_WL12XX=m
|
||||
CONFIG_WL18XX=m
|
||||
CONFIG_WLCORE=m
|
||||
CONFIG_WLCORE_SPI=m
|
||||
CONFIG_WLCORE_SDIO=m
|
||||
CONFIG_WILINK_PLATFORM_DATA=y
|
||||
CONFIG_WLAN_VENDOR_ZYDAS=y
|
||||
|
@ -3302,13 +3336,6 @@ CONFIG_HISAX_ST5481=m
|
|||
CONFIG_HISAX_HFCUSB=m
|
||||
CONFIG_HISAX_HFC4S8S=m
|
||||
CONFIG_HISAX_FRITZ_PCIPNP=m
|
||||
|
||||
#
|
||||
# Active cards
|
||||
#
|
||||
CONFIG_ISDN_DRV_ICN=m
|
||||
CONFIG_ISDN_DRV_PCBIT=m
|
||||
CONFIG_ISDN_DRV_ACT2000=m
|
||||
CONFIG_ISDN_CAPI=m
|
||||
CONFIG_CAPI_TRACE=y
|
||||
CONFIG_ISDN_CAPI_CAPI20=m
|
||||
|
@ -3421,6 +3448,7 @@ CONFIG_KEYBOARD_CROS_EC=m
|
|||
CONFIG_INPUT_MOUSE=y
|
||||
CONFIG_MOUSE_PS2=m
|
||||
CONFIG_MOUSE_PS2_ALPS=y
|
||||
CONFIG_MOUSE_PS2_BYD=y
|
||||
CONFIG_MOUSE_PS2_LOGIPS2PP=y
|
||||
CONFIG_MOUSE_PS2_SYNAPTICS=y
|
||||
CONFIG_MOUSE_PS2_CYPRESS=y
|
||||
|
@ -3519,6 +3547,7 @@ CONFIG_TOUCHSCREEN_WACOM_I2C=m
|
|||
CONFIG_TOUCHSCREEN_MAX11801=m
|
||||
CONFIG_TOUCHSCREEN_MCS5000=m
|
||||
CONFIG_TOUCHSCREEN_MMS114=m
|
||||
CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
|
||||
CONFIG_TOUCHSCREEN_MTOUCH=m
|
||||
CONFIG_TOUCHSCREEN_INEXIO=m
|
||||
CONFIG_TOUCHSCREEN_INTEL_MID=m
|
||||
|
@ -3629,6 +3658,13 @@ CONFIG_INPUT_SOC_BUTTON_ARRAY=m
|
|||
CONFIG_INPUT_DRV260X_HAPTICS=m
|
||||
CONFIG_INPUT_DRV2665_HAPTICS=m
|
||||
CONFIG_INPUT_DRV2667_HAPTICS=m
|
||||
CONFIG_RMI4_CORE=m
|
||||
CONFIG_RMI4_I2C=m
|
||||
CONFIG_RMI4_SPI=m
|
||||
CONFIG_RMI4_2D_SENSOR=y
|
||||
CONFIG_RMI4_F11=y
|
||||
CONFIG_RMI4_F12=y
|
||||
CONFIG_RMI4_F30=y
|
||||
|
||||
#
|
||||
# Hardware I/O ports
|
||||
|
@ -3713,6 +3749,7 @@ CONFIG_SERIAL_8250_DW=m
|
|||
CONFIG_SERIAL_8250_RT288X=y
|
||||
CONFIG_SERIAL_8250_FINTEK=m
|
||||
CONFIG_SERIAL_8250_MID=m
|
||||
CONFIG_SERIAL_8250_MOXA=m
|
||||
|
||||
#
|
||||
# Non-8250 serial port support
|
||||
|
@ -3744,6 +3781,7 @@ CONFIG_SERIAL_RP2=m
|
|||
CONFIG_SERIAL_RP2_NR_UARTS=32
|
||||
CONFIG_SERIAL_FSL_LPUART=m
|
||||
CONFIG_SERIAL_MEN_Z135=m
|
||||
# CONFIG_SERIAL_MVEBU_UART is not set
|
||||
CONFIG_TTY_PRINTK=y
|
||||
CONFIG_PRINTER=m
|
||||
# CONFIG_LP_CONSOLE is not set
|
||||
|
@ -3913,14 +3951,18 @@ CONFIG_SPI_MASTER=y
|
|||
# SPI Master Controller Drivers
|
||||
#
|
||||
CONFIG_SPI_ALTERA=m
|
||||
CONFIG_SPI_AXI_SPI_ENGINE=m
|
||||
CONFIG_SPI_BITBANG=m
|
||||
CONFIG_SPI_BUTTERFLY=m
|
||||
CONFIG_SPI_CADENCE=m
|
||||
CONFIG_SPI_DESIGNWARE=m
|
||||
CONFIG_SPI_DW_PCI=m
|
||||
CONFIG_SPI_DW_MID_DMA=y
|
||||
CONFIG_SPI_DW_MMIO=m
|
||||
CONFIG_SPI_DLN2=m
|
||||
CONFIG_SPI_GPIO=m
|
||||
CONFIG_SPI_LM70_LLP=m
|
||||
CONFIG_SPI_OC_TINY=m
|
||||
CONFIG_SPI_PXA2XX_DMA=y
|
||||
CONFIG_SPI_PXA2XX=m
|
||||
CONFIG_SPI_PXA2XX_PCI=m
|
||||
CONFIG_SPI_SC18IS602=m
|
||||
|
@ -3928,10 +3970,6 @@ CONFIG_SPI_TOPCLIFF_PCH=m
|
|||
CONFIG_SPI_XCOMM=m
|
||||
# CONFIG_SPI_XILINX is not set
|
||||
CONFIG_SPI_ZYNQMP_GQSPI=m
|
||||
CONFIG_SPI_DESIGNWARE=m
|
||||
CONFIG_SPI_DW_PCI=m
|
||||
CONFIG_SPI_DW_MID_DMA=y
|
||||
CONFIG_SPI_DW_MMIO=m
|
||||
|
||||
#
|
||||
# SPI Protocol Masters
|
||||
|
@ -4012,18 +4050,21 @@ CONFIG_GPIO_DWAPB=m
|
|||
CONFIG_GPIO_GENERIC_PLATFORM=m
|
||||
CONFIG_GPIO_ICH=m
|
||||
CONFIG_GPIO_LYNXPOINT=y
|
||||
CONFIG_GPIO_MENZ127=m
|
||||
CONFIG_GPIO_VX855=m
|
||||
CONFIG_GPIO_ZX=y
|
||||
|
||||
#
|
||||
# Port-mapped I/O GPIO drivers
|
||||
#
|
||||
CONFIG_GPIO_104_DIO_48E=m
|
||||
CONFIG_GPIO_104_IDIO_16=m
|
||||
CONFIG_GPIO_104_IDI_48=m
|
||||
CONFIG_GPIO_F7188X=m
|
||||
CONFIG_GPIO_IT87=m
|
||||
CONFIG_GPIO_SCH=m
|
||||
CONFIG_GPIO_SCH311X=m
|
||||
CONFIG_GPIO_WS16C48=m
|
||||
|
||||
#
|
||||
# I2C GPIO expanders
|
||||
|
@ -4034,6 +4075,7 @@ CONFIG_GPIO_MAX732X=m
|
|||
CONFIG_GPIO_PCA953X=m
|
||||
CONFIG_GPIO_PCF857X=m
|
||||
CONFIG_GPIO_SX150X=y
|
||||
CONFIG_GPIO_TPIC2810=m
|
||||
|
||||
#
|
||||
# MFD GPIO expanders
|
||||
|
@ -4052,6 +4094,8 @@ CONFIG_GPIO_MSIC=y
|
|||
CONFIG_GPIO_PALMAS=y
|
||||
CONFIG_GPIO_RC5T583=y
|
||||
CONFIG_GPIO_TIMBERDALE=y
|
||||
CONFIG_GPIO_TPS65086=m
|
||||
CONFIG_GPIO_TPS65218=m
|
||||
CONFIG_GPIO_TPS6586X=y
|
||||
CONFIG_GPIO_TPS65910=y
|
||||
CONFIG_GPIO_TPS65912=m
|
||||
|
@ -4076,6 +4120,7 @@ CONFIG_GPIO_RDC321X=m
|
|||
#
|
||||
CONFIG_GPIO_MAX7301=m
|
||||
CONFIG_GPIO_MC33880=m
|
||||
CONFIG_GPIO_PISOSR=m
|
||||
|
||||
#
|
||||
# SPI or I2C GPIO expanders
|
||||
|
@ -4231,6 +4276,7 @@ CONFIG_SENSORS_JC42=m
|
|||
CONFIG_SENSORS_POWR1220=m
|
||||
CONFIG_SENSORS_LINEAGE=m
|
||||
CONFIG_SENSORS_LTC2945=m
|
||||
CONFIG_SENSORS_LTC2990=m
|
||||
CONFIG_SENSORS_LTC4151=m
|
||||
CONFIG_SENSORS_LTC4215=m
|
||||
CONFIG_SENSORS_LTC4222=m
|
||||
|
@ -4388,6 +4434,7 @@ CONFIG_ACQUIRE_WDT=m
|
|||
CONFIG_ADVANTECH_WDT=m
|
||||
CONFIG_ALIM1535_WDT=m
|
||||
CONFIG_ALIM7101_WDT=m
|
||||
CONFIG_EBC_C384_WDT=m
|
||||
CONFIG_F71808E_WDT=m
|
||||
CONFIG_SP5100_TCO=m
|
||||
CONFIG_SBC_FITPC2_WATCHDOG=m
|
||||
|
@ -4422,7 +4469,8 @@ CONFIG_W83877F_WDT=m
|
|||
CONFIG_W83977F_WDT=m
|
||||
CONFIG_MACHZ_WDT=m
|
||||
CONFIG_SBC_EPX_C3_WATCHDOG=m
|
||||
CONFIG_BCM7038_WDT=m
|
||||
CONFIG_INTEL_MEI_WDT=m
|
||||
CONFIG_NI903X_WDT=m
|
||||
CONFIG_MEN_A21_WDT=m
|
||||
CONFIG_XEN_WDT=m
|
||||
|
||||
|
@ -4487,7 +4535,8 @@ CONFIG_MFD_AS3711=y
|
|||
CONFIG_PMIC_ADP5520=y
|
||||
CONFIG_MFD_AAT2870_CORE=y
|
||||
CONFIG_MFD_BCM590XX=m
|
||||
CONFIG_MFD_AXP20X=y
|
||||
CONFIG_MFD_AXP20X=m
|
||||
CONFIG_MFD_AXP20X_I2C=m
|
||||
CONFIG_MFD_CROS_EC=m
|
||||
CONFIG_MFD_CROS_EC_I2C=m
|
||||
CONFIG_MFD_CROS_EC_SPI=m
|
||||
|
@ -4557,6 +4606,7 @@ CONFIG_MFD_PALMAS=y
|
|||
CONFIG_TPS6105X=m
|
||||
CONFIG_TPS65010=m
|
||||
CONFIG_TPS6507X=m
|
||||
CONFIG_MFD_TPS65086=m
|
||||
CONFIG_MFD_TPS65090=y
|
||||
CONFIG_MFD_TPS65217=m
|
||||
CONFIG_MFD_TPS65218=m
|
||||
|
@ -4658,6 +4708,7 @@ CONFIG_REGULATOR_TPS6105X=m
|
|||
CONFIG_REGULATOR_TPS62360=m
|
||||
CONFIG_REGULATOR_TPS65023=m
|
||||
CONFIG_REGULATOR_TPS6507X=m
|
||||
CONFIG_REGULATOR_TPS65086=m
|
||||
CONFIG_REGULATOR_TPS65090=m
|
||||
CONFIG_REGULATOR_TPS65217=m
|
||||
CONFIG_REGULATOR_TPS6524X=m
|
||||
|
@ -4985,7 +5036,6 @@ CONFIG_DVB_NETUP_UNIDVB=m
|
|||
CONFIG_V4L_PLATFORM_DRIVERS=y
|
||||
CONFIG_VIDEO_CAFE_CCIC=m
|
||||
CONFIG_VIDEO_VIA_CAMERA=m
|
||||
CONFIG_VIDEO_TIMBERDALE=m
|
||||
CONFIG_SOC_CAMERA=m
|
||||
CONFIG_SOC_CAMERA_PLATFORM=m
|
||||
CONFIG_V4L_MEM2MEM_DRIVERS=y
|
||||
|
@ -5378,6 +5428,7 @@ CONFIG_VGA_ARB_MAX_GPUS=16
|
|||
CONFIG_VGA_SWITCHEROO=y
|
||||
CONFIG_DRM=m
|
||||
CONFIG_DRM_MIPI_DSI=y
|
||||
# CONFIG_DRM_DP_AUX_CHARDEV is not set
|
||||
CONFIG_DRM_KMS_HELPER=m
|
||||
CONFIG_DRM_KMS_FB_HELPER=y
|
||||
CONFIG_DRM_FBDEV_EMULATION=y
|
||||
|
@ -5399,6 +5450,11 @@ CONFIG_DRM_AMDGPU=m
|
|||
# CONFIG_DRM_AMDGPU_CIK is not set
|
||||
CONFIG_DRM_AMDGPU_USERPTR=y
|
||||
# CONFIG_DRM_AMD_POWERPLAY is not set
|
||||
|
||||
#
|
||||
# ACP (Audio CoProcessor) Configuration
|
||||
#
|
||||
# CONFIG_DRM_AMD_ACP is not set
|
||||
CONFIG_DRM_NOUVEAU=m
|
||||
CONFIG_NOUVEAU_DEBUG=5
|
||||
CONFIG_NOUVEAU_DEBUG_DEFAULT=3
|
||||
|
@ -5406,6 +5462,7 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
|
|||
CONFIG_DRM_I810=m
|
||||
CONFIG_DRM_I915=m
|
||||
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
|
||||
CONFIG_DRM_I915_USERPTR=y
|
||||
CONFIG_DRM_MGA=m
|
||||
CONFIG_DRM_SIS=m
|
||||
CONFIG_DRM_VIA=m
|
||||
|
@ -5624,11 +5681,13 @@ CONFIG_SOUND_OSS_CORE=y
|
|||
CONFIG_SND=m
|
||||
CONFIG_SND_TIMER=m
|
||||
CONFIG_SND_PCM=m
|
||||
CONFIG_SND_PCM_ELD=y
|
||||
CONFIG_SND_DMAENGINE_PCM=m
|
||||
CONFIG_SND_HWDEP=m
|
||||
CONFIG_SND_RAWMIDI=m
|
||||
CONFIG_SND_COMPRESS_OFFLOAD=m
|
||||
CONFIG_SND_JACK=y
|
||||
CONFIG_SND_JACK_INPUT_DEV=y
|
||||
CONFIG_SND_SEQUENCER=m
|
||||
CONFIG_SND_SEQ_DUMMY=m
|
||||
CONFIG_SND_OSSEMUL=y
|
||||
|
@ -5917,11 +5976,14 @@ CONFIG_SND_SOC_CS4349=m
|
|||
CONFIG_SND_SOC_DMIC=m
|
||||
CONFIG_SND_SOC_ES8328=m
|
||||
CONFIG_SND_SOC_GTM601=m
|
||||
CONFIG_SND_SOC_HDAC_HDMI=m
|
||||
CONFIG_SND_SOC_INNO_RK3036=m
|
||||
CONFIG_SND_SOC_MAX98090=m
|
||||
CONFIG_SND_SOC_MAX98357A=m
|
||||
CONFIG_SND_SOC_PCM1681=m
|
||||
CONFIG_SND_SOC_PCM179X=m
|
||||
CONFIG_SND_SOC_PCM179X_I2C=m
|
||||
CONFIG_SND_SOC_PCM179X_SPI=m
|
||||
CONFIG_SND_SOC_PCM3168A=m
|
||||
CONFIG_SND_SOC_PCM3168A_I2C=m
|
||||
CONFIG_SND_SOC_PCM3168A_SPI=m
|
||||
|
@ -5931,6 +5993,7 @@ CONFIG_SND_SOC_PCM512x_SPI=m
|
|||
CONFIG_SND_SOC_RL6231=m
|
||||
CONFIG_SND_SOC_RL6347A=m
|
||||
CONFIG_SND_SOC_RT286=m
|
||||
CONFIG_SND_SOC_RT5616=m
|
||||
CONFIG_SND_SOC_RT5631=m
|
||||
CONFIG_SND_SOC_RT5640=m
|
||||
CONFIG_SND_SOC_RT5645=m
|
||||
|
@ -6010,6 +6073,7 @@ CONFIG_HID_CHERRY=m
|
|||
CONFIG_HID_CHICONY=m
|
||||
CONFIG_HID_CORSAIR=m
|
||||
CONFIG_HID_PRODIKEYS=m
|
||||
CONFIG_HID_CMEDIA=m
|
||||
CONFIG_HID_CP2112=m
|
||||
CONFIG_HID_CYPRESS=m
|
||||
CONFIG_HID_DRAGONRISE=m
|
||||
|
@ -6592,6 +6656,7 @@ CONFIG_INFINIBAND_MTHCA=m
|
|||
CONFIG_INFINIBAND_CXGB3=m
|
||||
# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
|
||||
CONFIG_INFINIBAND_CXGB4=m
|
||||
CONFIG_INFINIBAND_I40IW=m
|
||||
CONFIG_MLX4_INFINIBAND=m
|
||||
CONFIG_MLX5_INFINIBAND=m
|
||||
CONFIG_INFINIBAND_NES=m
|
||||
|
@ -6655,10 +6720,10 @@ CONFIG_RTC_DRV_88PM80X=m
|
|||
CONFIG_RTC_DRV_ABB5ZES3=m
|
||||
CONFIG_RTC_DRV_ABX80X=m
|
||||
CONFIG_RTC_DRV_DS1307=m
|
||||
CONFIG_RTC_DRV_DS1307_HWMON=y
|
||||
CONFIG_RTC_DRV_DS1374=m
|
||||
CONFIG_RTC_DRV_DS1374_WDT=y
|
||||
CONFIG_RTC_DRV_DS1672=m
|
||||
CONFIG_RTC_DRV_DS3232=m
|
||||
CONFIG_RTC_DRV_LP8788=m
|
||||
CONFIG_RTC_DRV_MAX6900=m
|
||||
CONFIG_RTC_DRV_MAX8907=m
|
||||
|
@ -6670,16 +6735,15 @@ CONFIG_RTC_DRV_ISL1208=m
|
|||
CONFIG_RTC_DRV_ISL12022=m
|
||||
CONFIG_RTC_DRV_ISL12057=m
|
||||
CONFIG_RTC_DRV_X1205=m
|
||||
CONFIG_RTC_DRV_PALMAS=m
|
||||
CONFIG_RTC_DRV_PCF2127=m
|
||||
CONFIG_RTC_DRV_PCF8523=m
|
||||
CONFIG_RTC_DRV_PCF8563=m
|
||||
CONFIG_RTC_DRV_PCF85063=m
|
||||
CONFIG_RTC_DRV_PCF8563=m
|
||||
CONFIG_RTC_DRV_PCF8583=m
|
||||
CONFIG_RTC_DRV_M41T80=m
|
||||
CONFIG_RTC_DRV_M41T80_WDT=y
|
||||
CONFIG_RTC_DRV_BQ32K=m
|
||||
CONFIG_RTC_DRV_TWL4030=m
|
||||
CONFIG_RTC_DRV_PALMAS=m
|
||||
CONFIG_RTC_DRV_TPS6586X=m
|
||||
CONFIG_RTC_DRV_TPS65910=m
|
||||
CONFIG_RTC_DRV_TPS80031=m
|
||||
|
@ -6691,6 +6755,7 @@ CONFIG_RTC_DRV_RX8581=m
|
|||
CONFIG_RTC_DRV_RX8025=m
|
||||
CONFIG_RTC_DRV_EM3027=m
|
||||
CONFIG_RTC_DRV_RV3029C2=m
|
||||
CONFIG_RTC_DRV_RV3029_HWMON=y
|
||||
CONFIG_RTC_DRV_RV8803=m
|
||||
CONFIG_RTC_DRV_S5M=m
|
||||
|
||||
|
@ -6703,13 +6768,20 @@ CONFIG_RTC_DRV_DS1305=m
|
|||
CONFIG_RTC_DRV_DS1343=m
|
||||
CONFIG_RTC_DRV_DS1347=m
|
||||
CONFIG_RTC_DRV_DS1390=m
|
||||
CONFIG_RTC_DRV_MAX6902=m
|
||||
CONFIG_RTC_DRV_R9701=m
|
||||
CONFIG_RTC_DRV_RS5C348=m
|
||||
CONFIG_RTC_DRV_DS3234=m
|
||||
CONFIG_RTC_DRV_PCF2123=m
|
||||
CONFIG_RTC_DRV_RX4581=m
|
||||
CONFIG_RTC_DRV_RX6110=m
|
||||
CONFIG_RTC_DRV_RS5C348=m
|
||||
CONFIG_RTC_DRV_MAX6902=m
|
||||
CONFIG_RTC_DRV_PCF2123=m
|
||||
CONFIG_RTC_DRV_MCP795=m
|
||||
CONFIG_RTC_I2C_AND_SPI=y
|
||||
|
||||
#
|
||||
# SPI and I2C RTC drivers
|
||||
#
|
||||
CONFIG_RTC_DRV_DS3232=m
|
||||
CONFIG_RTC_DRV_PCF2127=m
|
||||
|
||||
#
|
||||
# Platform RTC drivers
|
||||
|
@ -6768,6 +6840,8 @@ CONFIG_DMA_ACPI=y
|
|||
CONFIG_INTEL_IDMA64=m
|
||||
CONFIG_PCH_DMA=m
|
||||
CONFIG_TIMB_DMA=m
|
||||
CONFIG_QCOM_HIDMA_MGMT=m
|
||||
CONFIG_QCOM_HIDMA=m
|
||||
CONFIG_DW_DMAC_CORE=m
|
||||
CONFIG_DW_DMAC=m
|
||||
CONFIG_DW_DMAC_PCI=m
|
||||
|
@ -6803,6 +6877,7 @@ CONFIG_VFIO_PCI=m
|
|||
CONFIG_VFIO_PCI_VGA=y
|
||||
CONFIG_VFIO_PCI_MMAP=y
|
||||
CONFIG_VFIO_PCI_INTX=y
|
||||
CONFIG_VFIO_PCI_IGD=y
|
||||
CONFIG_IRQ_BYPASS_MANAGER=m
|
||||
CONFIG_VIRT_DRIVERS=y
|
||||
CONFIG_VIRTIO=y
|
||||
|
@ -6993,10 +7068,6 @@ CONFIG_COMEDI_ISADMA=m
|
|||
CONFIG_COMEDI_NI_LABPC=m
|
||||
CONFIG_COMEDI_NI_LABPC_ISADMA=m
|
||||
CONFIG_COMEDI_NI_TIO=m
|
||||
CONFIG_PANEL=m
|
||||
CONFIG_PANEL_PARPORT=0
|
||||
CONFIG_PANEL_PROFILE=5
|
||||
# CONFIG_PANEL_CHANGE_MESSAGE is not set
|
||||
CONFIG_RTL8192U=m
|
||||
CONFIG_RTLLIB=m
|
||||
CONFIG_RTLLIB_CRYPTO_CCMP=m
|
||||
|
@ -7078,13 +7149,6 @@ CONFIG_SENSORS_ISL29028=m
|
|||
CONFIG_TSL2583=m
|
||||
CONFIG_TSL2x7x=m
|
||||
|
||||
#
|
||||
# Magnetometer sensors
|
||||
#
|
||||
CONFIG_SENSORS_HMC5843=m
|
||||
CONFIG_SENSORS_HMC5843_I2C=m
|
||||
CONFIG_SENSORS_HMC5843_SPI=m
|
||||
|
||||
#
|
||||
# Active energy metering IC
|
||||
#
|
||||
|
@ -7106,7 +7170,6 @@ CONFIG_AD2S1210=m
|
|||
#
|
||||
# Triggers - standalone
|
||||
#
|
||||
CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
|
||||
CONFIG_FB_SM750=m
|
||||
CONFIG_FB_XGI=m
|
||||
|
||||
|
@ -7129,12 +7192,11 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
|
|||
CONFIG_SPEAKUP_SYNTH_SPKOUT=m
|
||||
CONFIG_SPEAKUP_SYNTH_TXPRT=m
|
||||
CONFIG_SPEAKUP_SYNTH_DUMMY=m
|
||||
CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
|
||||
CONFIG_STAGING_MEDIA=y
|
||||
CONFIG_I2C_BCM2048=m
|
||||
CONFIG_DVB_CXD2099=m
|
||||
CONFIG_DVB_MN88472=m
|
||||
CONFIG_DVB_MN88473=m
|
||||
CONFIG_VIDEO_TIMBERDALE=m
|
||||
CONFIG_LIRC_STAGING=y
|
||||
CONFIG_LIRC_BT829=m
|
||||
CONFIG_LIRC_IMON=m
|
||||
|
@ -7149,22 +7211,18 @@ CONFIG_STAGING_RDMA=m
|
|||
#
|
||||
# Android
|
||||
#
|
||||
CONFIG_WIMAX_GDM72XX=m
|
||||
CONFIG_WIMAX_GDM72XX_QOS=y
|
||||
CONFIG_WIMAX_GDM72XX_K_MODE=y
|
||||
CONFIG_WIMAX_GDM72XX_WIMAX2=y
|
||||
CONFIG_WIMAX_GDM72XX_USB=y
|
||||
# CONFIG_WIMAX_GDM72XX_SDIO is not set
|
||||
CONFIG_WIMAX_GDM72XX_USB_PM=y
|
||||
CONFIG_LTE_GDM724X=m
|
||||
CONFIG_FIREWIRE_SERIAL=m
|
||||
CONFIG_FWTTY_MAX_TOTAL_PORTS=64
|
||||
CONFIG_FWTTY_MAX_CARD_PORTS=32
|
||||
CONFIG_MTD_SPINAND_MT29F=m
|
||||
CONFIG_MTD_SPINAND_ONDIEECC=y
|
||||
CONFIG_LNET=m
|
||||
CONFIG_LNET_MAX_PAYLOAD=1048576
|
||||
# CONFIG_LNET_SELFTEST is not set
|
||||
CONFIG_LNET_XPRT_IB=m
|
||||
# CONFIG_LUSTRE_FS is not set
|
||||
CONFIG_DGNC=m
|
||||
CONFIG_DGAP=m
|
||||
CONFIG_GS_FPGABOOT=m
|
||||
CONFIG_FB_TFT=m
|
||||
CONFIG_FB_TFT_AGM1264K_FL=m
|
||||
|
@ -7185,7 +7243,9 @@ CONFIG_FB_TFT_RA8875=m
|
|||
CONFIG_FB_TFT_S6D02A1=m
|
||||
CONFIG_FB_TFT_S6D1121=m
|
||||
CONFIG_FB_TFT_SSD1289=m
|
||||
CONFIG_FB_TFT_SSD1305=m
|
||||
CONFIG_FB_TFT_SSD1306=m
|
||||
CONFIG_FB_TFT_SSD1325=m
|
||||
CONFIG_FB_TFT_SSD1331=m
|
||||
CONFIG_FB_TFT_SSD1351=m
|
||||
CONFIG_FB_TFT_ST7735R=m
|
||||
|
@ -7211,11 +7271,19 @@ CONFIG_AIM_V4L2=m
|
|||
CONFIG_HDM_DIM2=m
|
||||
CONFIG_HDM_I2C=m
|
||||
CONFIG_HDM_USB=m
|
||||
|
||||
#
|
||||
# Old ISDN4Linux (deprecated)
|
||||
#
|
||||
CONFIG_ISDN_DRV_ICN=m
|
||||
CONFIG_ISDN_DRV_PCBIT=m
|
||||
CONFIG_ISDN_DRV_ACT2000=m
|
||||
CONFIG_X86_PLATFORM_DEVICES=y
|
||||
CONFIG_ACER_WMI=m
|
||||
CONFIG_ACERHDF=m
|
||||
CONFIG_ALIENWARE_WMI=m
|
||||
CONFIG_ASUS_LAPTOP=m
|
||||
CONFIG_DELL_SMBIOS=m
|
||||
CONFIG_DELL_LAPTOP=m
|
||||
CONFIG_DELL_WMI=m
|
||||
CONFIG_DELL_WMI_AIO=m
|
||||
|
@ -7291,6 +7359,7 @@ CONFIG_COMMON_CLK=y
|
|||
#
|
||||
CONFIG_COMMON_CLK_WM831X=m
|
||||
CONFIG_COMMON_CLK_SI5351=m
|
||||
CONFIG_COMMON_CLK_CDCE706=m
|
||||
CONFIG_COMMON_CLK_CS2000_CP=m
|
||||
CONFIG_COMMON_CLK_S2MPS11=m
|
||||
CONFIG_CLK_TWL6040=m
|
||||
|
@ -7298,7 +7367,6 @@ CONFIG_CLK_TWL6040=m
|
|||
CONFIG_COMMON_CLK_PALMAS=m
|
||||
CONFIG_COMMON_CLK_PWM=m
|
||||
# CONFIG_COMMON_CLK_PXA is not set
|
||||
CONFIG_COMMON_CLK_CDCE706=m
|
||||
|
||||
#
|
||||
# Hardware Spinlock drivers
|
||||
|
@ -7446,7 +7514,9 @@ CONFIG_PALMAS_GPADC=m
|
|||
CONFIG_QCOM_SPMI_IADC=m
|
||||
CONFIG_QCOM_SPMI_VADC=m
|
||||
CONFIG_TI_ADC081C=m
|
||||
CONFIG_TI_ADC0832=m
|
||||
CONFIG_TI_ADC128S052=m
|
||||
CONFIG_TI_ADS1015=m
|
||||
CONFIG_TI_AM335X_ADC=m
|
||||
CONFIG_TWL4030_MADC=m
|
||||
CONFIG_TWL6030_GPADC=m
|
||||
|
@ -7460,6 +7530,7 @@ CONFIG_AD8366=m
|
|||
#
|
||||
# Chemical Sensors
|
||||
#
|
||||
CONFIG_ATLAS_PH_SENSOR=m
|
||||
CONFIG_IAQCORE=m
|
||||
CONFIG_VZ89X=m
|
||||
|
||||
|
@ -7492,6 +7563,7 @@ CONFIG_AD5504=m
|
|||
CONFIG_AD5624R_SPI=m
|
||||
CONFIG_AD5686=m
|
||||
CONFIG_AD5755=m
|
||||
CONFIG_AD5761=m
|
||||
CONFIG_AD5764=m
|
||||
CONFIG_AD5791=m
|
||||
CONFIG_AD7303=m
|
||||
|
@ -7499,6 +7571,7 @@ CONFIG_M62332=m
|
|||
CONFIG_MAX517=m
|
||||
CONFIG_MCP4725=m
|
||||
CONFIG_MCP4922=m
|
||||
CONFIG_STX104=m
|
||||
|
||||
#
|
||||
# IIO dummy driver
|
||||
|
@ -7539,8 +7612,14 @@ CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
|
|||
CONFIG_ITG3200=m
|
||||
|
||||
#
|
||||
# Health sensors
|
||||
# Health Sensors
|
||||
#
|
||||
|
||||
#
|
||||
# Heart Rate Monitors
|
||||
#
|
||||
CONFIG_AFE4403=m
|
||||
CONFIG_AFE4404=m
|
||||
CONFIG_MAX30100=m
|
||||
|
||||
#
|
||||
|
@ -7559,6 +7638,8 @@ CONFIG_ADIS16400=m
|
|||
CONFIG_ADIS16480=m
|
||||
CONFIG_KMX61=m
|
||||
CONFIG_INV_MPU6050_IIO=m
|
||||
CONFIG_INV_MPU6050_I2C=m
|
||||
CONFIG_INV_MPU6050_SPI=m
|
||||
CONFIG_IIO_ADIS_LIB=m
|
||||
CONFIG_IIO_ADIS_LIB_BUFFER=y
|
||||
|
||||
|
@ -7605,6 +7686,9 @@ CONFIG_MMC35240=m
|
|||
CONFIG_IIO_ST_MAGN_3AXIS=m
|
||||
CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
|
||||
CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
|
||||
CONFIG_SENSORS_HMC5843=m
|
||||
CONFIG_SENSORS_HMC5843_I2C=m
|
||||
CONFIG_SENSORS_HMC5843_SPI=m
|
||||
|
||||
#
|
||||
# Inclinometer sensors
|
||||
|
@ -7623,6 +7707,7 @@ CONFIG_IIO_SYSFS_TRIGGER=m
|
|||
# Digital potentiometers
|
||||
#
|
||||
CONFIG_MCP4531=m
|
||||
CONFIG_TPL0102=m
|
||||
|
||||
#
|
||||
# Pressure sensors
|
||||
|
@ -7630,6 +7715,8 @@ CONFIG_MCP4531=m
|
|||
CONFIG_BMP280=m
|
||||
CONFIG_HID_SENSOR_PRESS=m
|
||||
CONFIG_MPL115=m
|
||||
CONFIG_MPL115_I2C=m
|
||||
CONFIG_MPL115_SPI=m
|
||||
CONFIG_MPL3115=m
|
||||
CONFIG_MS5611=m
|
||||
CONFIG_MS5611_I2C=m
|
||||
|
@ -7692,7 +7779,6 @@ CONFIG_PWM_PCA9685=m
|
|||
CONFIG_PWM_TWL=m
|
||||
CONFIG_PWM_TWL_LED=m
|
||||
CONFIG_ARM_GIC_MAX_NR=1
|
||||
CONFIG_TS4800_IRQ=m
|
||||
CONFIG_IPACK_BUS=m
|
||||
CONFIG_BOARD_TPCI200=m
|
||||
CONFIG_SERIAL_IPOCTAL=m
|
||||
|
@ -7741,6 +7827,7 @@ CONFIG_NVMEM=m
|
|||
CONFIG_STM=m
|
||||
CONFIG_STM_DUMMY=m
|
||||
CONFIG_STM_SOURCE_CONSOLE=m
|
||||
CONFIG_STM_SOURCE_HEARTBEAT=m
|
||||
CONFIG_INTEL_TH=m
|
||||
CONFIG_INTEL_TH_PCI=m
|
||||
CONFIG_INTEL_TH_GTH=m
|
||||
|
@ -7768,6 +7855,8 @@ CONFIG_DMI_SYSFS=m
|
|||
CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
|
||||
CONFIG_ISCSI_IBFT_FIND=y
|
||||
CONFIG_ISCSI_IBFT=m
|
||||
CONFIG_FW_CFG_SYSFS=m
|
||||
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
|
||||
# CONFIG_GOOGLE_FIRMWARE is not set
|
||||
|
||||
#
|
||||
|
@ -7843,6 +7932,7 @@ CONFIG_FS_POSIX_ACL=y
|
|||
CONFIG_EXPORTFS=y
|
||||
CONFIG_FILE_LOCKING=y
|
||||
CONFIG_MANDATORY_FILE_LOCKING=y
|
||||
CONFIG_FS_ENCRYPTION=m
|
||||
CONFIG_FSNOTIFY=y
|
||||
CONFIG_DNOTIFY=y
|
||||
CONFIG_INOTIFY_USER=y
|
||||
|
@ -7890,6 +7980,7 @@ CONFIG_MSDOS_FS=m
|
|||
CONFIG_VFAT_FS=y
|
||||
CONFIG_FAT_DEFAULT_CODEPAGE=437
|
||||
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
|
||||
# CONFIG_FAT_DEFAULT_UTF8 is not set
|
||||
CONFIG_NTFS_FS=m
|
||||
# CONFIG_NTFS_DEBUG is not set
|
||||
# CONFIG_NTFS_RW is not set
|
||||
|
@ -7913,6 +8004,7 @@ CONFIG_HUGETLB_PAGE=y
|
|||
CONFIG_CONFIGFS_FS=m
|
||||
CONFIG_EFIVAR_FS=y
|
||||
CONFIG_MISC_FILESYSTEMS=y
|
||||
CONFIG_ORANGEFS_FS=m
|
||||
CONFIG_ADFS_FS=m
|
||||
# CONFIG_ADFS_FS_RW is not set
|
||||
CONFIG_AFFS_FS=m
|
||||
|
@ -8012,7 +8104,8 @@ CONFIG_NFSD_V2_ACL=y
|
|||
CONFIG_NFSD_V3=y
|
||||
CONFIG_NFSD_V3_ACL=y
|
||||
CONFIG_NFSD_V4=y
|
||||
CONFIG_NFSD_PNFS=y
|
||||
# CONFIG_NFSD_BLOCKLAYOUT is not set
|
||||
# CONFIG_NFSD_SCSILAYOUT is not set
|
||||
CONFIG_NFSD_V4_SECURITY_LABEL=y
|
||||
# CONFIG_NFSD_FAULT_INJECTION is not set
|
||||
CONFIG_GRACE_PERIOD=m
|
||||
|
@ -8155,6 +8248,8 @@ CONFIG_DEBUG_KERNEL=y
|
|||
#
|
||||
CONFIG_PAGE_EXTENSION=y
|
||||
# CONFIG_DEBUG_PAGEALLOC is not set
|
||||
# CONFIG_PAGE_POISONING is not set
|
||||
# CONFIG_DEBUG_PAGE_REF is not set
|
||||
# CONFIG_DEBUG_OBJECTS is not set
|
||||
# CONFIG_SLUB_DEBUG_ON is not set
|
||||
# CONFIG_SLUB_STATS is not set
|
||||
|
@ -8230,6 +8325,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
|
|||
# CONFIG_RCU_EQS_DEBUG is not set
|
||||
# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
|
||||
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
|
||||
# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
|
||||
CONFIG_NOTIFIER_ERROR_INJECTION=m
|
||||
CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
|
||||
CONFIG_PM_NOTIFIER_ERROR_INJECT=m
|
||||
|
@ -8303,6 +8399,7 @@ CONFIG_TEST_HEXDUMP=m
|
|||
CONFIG_TEST_STRING_HELPERS=m
|
||||
CONFIG_TEST_KSTRTOX=m
|
||||
CONFIG_TEST_PRINTF=m
|
||||
CONFIG_TEST_BITMAP=m
|
||||
# CONFIG_TEST_RHASHTABLE is not set
|
||||
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
|
||||
# CONFIG_DMA_API_DEBUG is not set
|
||||
|
@ -8335,7 +8432,6 @@ CONFIG_EARLY_PRINTK_EFI=y
|
|||
# CONFIG_X86_PTDUMP_CORE is not set
|
||||
# CONFIG_X86_PTDUMP is not set
|
||||
# CONFIG_EFI_PGT_DUMP is not set
|
||||
CONFIG_DEBUG_RODATA=y
|
||||
# CONFIG_DEBUG_RODATA_TEST is not set
|
||||
# CONFIG_DEBUG_WX is not set
|
||||
CONFIG_DEBUG_SET_MODULE_RONX=y
|
||||
|
@ -8359,7 +8455,6 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=1
|
|||
CONFIG_OPTIMIZE_INLINING=y
|
||||
# CONFIG_DEBUG_ENTRY is not set
|
||||
# CONFIG_DEBUG_NMI_SELFTEST is not set
|
||||
# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
|
||||
CONFIG_X86_DEBUG_FPU=y
|
||||
CONFIG_PUNIT_ATOM_DEBUG=m
|
||||
|
||||
|
@ -8455,11 +8550,9 @@ CONFIG_CRYPTO_HASH2=y
|
|||
CONFIG_CRYPTO_RNG=y
|
||||
CONFIG_CRYPTO_RNG2=y
|
||||
CONFIG_CRYPTO_RNG_DEFAULT=m
|
||||
CONFIG_CRYPTO_PCOMP=m
|
||||
CONFIG_CRYPTO_PCOMP2=y
|
||||
CONFIG_CRYPTO_AKCIPHER2=y
|
||||
CONFIG_CRYPTO_AKCIPHER=m
|
||||
CONFIG_CRYPTO_RSA=m
|
||||
CONFIG_CRYPTO_AKCIPHER=y
|
||||
CONFIG_CRYPTO_RSA=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_MANAGER2=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
|
@ -8560,7 +8653,6 @@ CONFIG_CRYPTO_TWOFISH_586=m
|
|||
# Compression
|
||||
#
|
||||
CONFIG_CRYPTO_DEFLATE=m
|
||||
CONFIG_CRYPTO_ZLIB=m
|
||||
CONFIG_CRYPTO_LZO=y
|
||||
CONFIG_CRYPTO_842=m
|
||||
CONFIG_CRYPTO_LZ4=m
|
||||
|
@ -8599,7 +8691,6 @@ CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
|
|||
CONFIG_CRYPTO_DEV_QAT_C62XVF=m
|
||||
CONFIG_ASYMMETRIC_KEY_TYPE=y
|
||||
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
|
||||
CONFIG_PUBLIC_KEY_ALGO_RSA=y
|
||||
CONFIG_X509_CERTIFICATE_PARSER=y
|
||||
CONFIG_PKCS7_MESSAGE_PARSER=y
|
||||
CONFIG_PKCS7_TEST_KEY=m
|
||||
|
@ -8610,6 +8701,7 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y
|
|||
#
|
||||
CONFIG_SYSTEM_TRUSTED_KEYRING=y
|
||||
CONFIG_SYSTEM_TRUSTED_KEYS=""
|
||||
# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
|
||||
CONFIG_HAVE_KVM=y
|
||||
CONFIG_HAVE_KVM_IRQCHIP=y
|
||||
CONFIG_HAVE_KVM_IRQFD=y
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.5.0-gnu Kernel Configuration
|
||||
# Linux/x86 4.6.0-gnu Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
|
@ -43,6 +43,7 @@ CONFIG_X86_64_SMP=y
|
|||
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
|
||||
CONFIG_ARCH_SUPPORTS_UPROBES=y
|
||||
CONFIG_FIX_EARLYCON_MEM=y
|
||||
CONFIG_DEBUG_RODATA=y
|
||||
CONFIG_PGTABLE_LEVELS=4
|
||||
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
|
||||
CONFIG_IRQ_WORK=y
|
||||
|
@ -204,6 +205,8 @@ CONFIG_SYSFS_SYSCALL=y
|
|||
CONFIG_SYSCTL_SYSCALL=y
|
||||
CONFIG_KALLSYMS=y
|
||||
CONFIG_KALLSYMS_ALL=y
|
||||
CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
|
||||
CONFIG_KALLSYMS_BASE_RELATIVE=y
|
||||
CONFIG_PRINTK=y
|
||||
CONFIG_BUG=y
|
||||
CONFIG_ELF_CORE=y
|
||||
|
@ -301,6 +304,7 @@ CONFIG_ARCH_MMAP_RND_BITS=28
|
|||
CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
|
||||
CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
|
||||
CONFIG_HAVE_COPY_THREAD_TLS=y
|
||||
CONFIG_HAVE_STACK_VALIDATION=y
|
||||
CONFIG_OLD_SIGSUSPEND3=y
|
||||
CONFIG_COMPAT_OLD_SIGACTION=y
|
||||
|
||||
|
@ -393,6 +397,7 @@ CONFIG_X86_FEATURE_NAMES=y
|
|||
CONFIG_X86_FAST_FEATURE_TESTS=y
|
||||
CONFIG_X86_X2APIC=y
|
||||
CONFIG_X86_MPPARSE=y
|
||||
# CONFIG_GOLDFISH is not set
|
||||
CONFIG_X86_EXTENDED_PLATFORM=y
|
||||
CONFIG_X86_NUMACHIP=y
|
||||
# CONFIG_X86_VSMP is not set
|
||||
|
@ -471,6 +476,7 @@ CONFIG_MICROCODE=y
|
|||
CONFIG_MICROCODE_INTEL=y
|
||||
CONFIG_MICROCODE_AMD=y
|
||||
CONFIG_MICROCODE_OLD_INTERFACE=y
|
||||
CONFIG_PERF_EVENTS_AMD_POWER=m
|
||||
CONFIG_X86_MSR=m
|
||||
CONFIG_X86_CPUID=m
|
||||
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
|
||||
|
@ -544,6 +550,8 @@ CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
|
|||
CONFIG_IDLE_PAGE_TRACKING=y
|
||||
CONFIG_ZONE_DEVICE=y
|
||||
CONFIG_FRAME_VECTOR=y
|
||||
CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
|
||||
CONFIG_ARCH_HAS_PKEYS=y
|
||||
CONFIG_X86_PMEM_LEGACY_DEVICE=y
|
||||
CONFIG_X86_PMEM_LEGACY=y
|
||||
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
|
||||
|
@ -558,6 +566,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y
|
|||
CONFIG_ARCH_RANDOM=y
|
||||
CONFIG_X86_SMAP=y
|
||||
CONFIG_X86_INTEL_MPX=y
|
||||
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
|
||||
CONFIG_EFI=y
|
||||
CONFIG_EFI_STUB=y
|
||||
CONFIG_EFI_MIXED=y
|
||||
|
@ -755,10 +764,19 @@ CONFIG_PCI_IOV=y
|
|||
CONFIG_PCI_PRI=y
|
||||
CONFIG_PCI_PASID=y
|
||||
CONFIG_PCI_LABEL=y
|
||||
CONFIG_PCI_HYPERV=m
|
||||
CONFIG_HOTPLUG_PCI=y
|
||||
CONFIG_HOTPLUG_PCI_ACPI=y
|
||||
CONFIG_HOTPLUG_PCI_ACPI_IBM=m
|
||||
CONFIG_HOTPLUG_PCI_CPCI=y
|
||||
CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
|
||||
CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
|
||||
CONFIG_HOTPLUG_PCI_SHPC=m
|
||||
|
||||
#
|
||||
# PCI host controller drivers
|
||||
#
|
||||
# CONFIG_PCIE_DW_PLAT is not set
|
||||
CONFIG_ISA_DMA_API=y
|
||||
CONFIG_AMD_NB=y
|
||||
CONFIG_PCCARD=m
|
||||
|
@ -778,13 +796,6 @@ CONFIG_YENTA_TOSHIBA=y
|
|||
CONFIG_PD6729=m
|
||||
CONFIG_I82092=m
|
||||
CONFIG_PCCARD_NONSTATIC=y
|
||||
CONFIG_HOTPLUG_PCI=y
|
||||
CONFIG_HOTPLUG_PCI_ACPI=y
|
||||
CONFIG_HOTPLUG_PCI_ACPI_IBM=m
|
||||
CONFIG_HOTPLUG_PCI_CPCI=y
|
||||
CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
|
||||
CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
|
||||
CONFIG_HOTPLUG_PCI_SHPC=m
|
||||
CONFIG_RAPIDIO=y
|
||||
CONFIG_RAPIDIO_TSI721=m
|
||||
CONFIG_RAPIDIO_DISC_TIMEOUT=30
|
||||
|
@ -792,6 +803,7 @@ CONFIG_RAPIDIO_DISC_TIMEOUT=30
|
|||
CONFIG_RAPIDIO_DMA_ENGINE=y
|
||||
# CONFIG_RAPIDIO_DEBUG is not set
|
||||
CONFIG_RAPIDIO_ENUM_BASIC=m
|
||||
CONFIG_RAPIDIO_MPORT_CDEV=m
|
||||
|
||||
#
|
||||
# RapidIO Switch drivers
|
||||
|
@ -877,7 +889,6 @@ CONFIG_INET_TUNNEL=m
|
|||
CONFIG_INET_XFRM_MODE_TRANSPORT=m
|
||||
CONFIG_INET_XFRM_MODE_TUNNEL=m
|
||||
CONFIG_INET_XFRM_MODE_BEET=m
|
||||
CONFIG_INET_LRO=y
|
||||
CONFIG_INET_DIAG=m
|
||||
CONFIG_INET_TCP_DIAG=m
|
||||
CONFIG_INET_UDP_DIAG=m
|
||||
|
@ -1422,11 +1433,15 @@ CONFIG_NET_ACT_CSUM=m
|
|||
CONFIG_NET_ACT_VLAN=m
|
||||
CONFIG_NET_ACT_BPF=m
|
||||
CONFIG_NET_ACT_CONNMARK=m
|
||||
CONFIG_NET_ACT_IFE=m
|
||||
CONFIG_NET_IFE_SKBMARK=m
|
||||
CONFIG_NET_IFE_SKBPRIO=m
|
||||
# CONFIG_NET_CLS_IND is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
CONFIG_DCB=y
|
||||
CONFIG_DNS_RESOLVER=y
|
||||
CONFIG_BATMAN_ADV=m
|
||||
# CONFIG_BATMAN_ADV_BATMAN_V is not set
|
||||
CONFIG_BATMAN_ADV_BLA=y
|
||||
CONFIG_BATMAN_ADV_DAT=y
|
||||
CONFIG_BATMAN_ADV_NC=y
|
||||
|
@ -1438,7 +1453,6 @@ CONFIG_OPENVSWITCH_VXLAN=m
|
|||
CONFIG_OPENVSWITCH_GENEVE=m
|
||||
CONFIG_VSOCKETS=m
|
||||
CONFIG_VMWARE_VMCI_VSOCKETS=m
|
||||
CONFIG_NETLINK_MMAP=y
|
||||
CONFIG_NETLINK_DIAG=m
|
||||
CONFIG_MPLS=y
|
||||
CONFIG_NET_MPLS_GSO=m
|
||||
|
@ -1498,6 +1512,14 @@ CONFIG_CAN_DEV=m
|
|||
CONFIG_CAN_CALC_BITTIMING=y
|
||||
CONFIG_CAN_LEDS=y
|
||||
CONFIG_CAN_JANZ_ICAN3=m
|
||||
CONFIG_CAN_C_CAN=m
|
||||
CONFIG_CAN_C_CAN_PLATFORM=m
|
||||
CONFIG_CAN_C_CAN_PCI=m
|
||||
CONFIG_CAN_CC770=m
|
||||
CONFIG_CAN_CC770_ISA=m
|
||||
CONFIG_CAN_CC770_PLATFORM=m
|
||||
CONFIG_CAN_IFI_CANFD=m
|
||||
CONFIG_CAN_M_CAN=m
|
||||
CONFIG_CAN_SJA1000=m
|
||||
CONFIG_CAN_SJA1000_ISA=m
|
||||
CONFIG_CAN_SJA1000_PLATFORM=m
|
||||
|
@ -1508,13 +1530,8 @@ CONFIG_CAN_PEAK_PCI=m
|
|||
CONFIG_CAN_PEAK_PCIEC=y
|
||||
CONFIG_CAN_KVASER_PCI=m
|
||||
CONFIG_CAN_PLX_PCI=m
|
||||
CONFIG_CAN_C_CAN=m
|
||||
CONFIG_CAN_C_CAN_PLATFORM=m
|
||||
CONFIG_CAN_C_CAN_PCI=m
|
||||
CONFIG_CAN_M_CAN=m
|
||||
CONFIG_CAN_CC770=m
|
||||
CONFIG_CAN_CC770_ISA=m
|
||||
CONFIG_CAN_CC770_PLATFORM=m
|
||||
CONFIG_CAN_SOFTING=m
|
||||
CONFIG_CAN_SOFTING_CS=m
|
||||
|
||||
#
|
||||
# CAN SPI interfaces
|
||||
|
@ -1530,8 +1547,6 @@ CONFIG_CAN_GS_USB=m
|
|||
CONFIG_CAN_KVASER_USB=m
|
||||
CONFIG_CAN_PEAK_USB=m
|
||||
CONFIG_CAN_8DEV_USB=m
|
||||
CONFIG_CAN_SOFTING=m
|
||||
CONFIG_CAN_SOFTING_CS=m
|
||||
# CONFIG_CAN_DEBUG_DEVICES is not set
|
||||
CONFIG_IRDA=m
|
||||
|
||||
|
@ -1601,6 +1616,7 @@ CONFIG_BT_HIDP=m
|
|||
CONFIG_BT_HS=y
|
||||
CONFIG_BT_LE=y
|
||||
CONFIG_BT_6LOWPAN=m
|
||||
# CONFIG_BT_LEDS is not set
|
||||
# CONFIG_BT_SELFTEST is not set
|
||||
CONFIG_BT_DEBUGFS=y
|
||||
|
||||
|
@ -1624,6 +1640,7 @@ CONFIG_BT_HCIUART_3WIRE=y
|
|||
CONFIG_BT_HCIUART_INTEL=y
|
||||
CONFIG_BT_HCIUART_BCM=y
|
||||
CONFIG_BT_HCIUART_QCA=y
|
||||
CONFIG_BT_HCIUART_AG6XX=y
|
||||
CONFIG_BT_HCIBCM203X=m
|
||||
CONFIG_BT_HCIBPA10X=m
|
||||
CONFIG_BT_HCIBFUSB=m
|
||||
|
@ -1639,6 +1656,7 @@ CONFIG_BT_WILINK=m
|
|||
CONFIG_AF_RXRPC=m
|
||||
# CONFIG_AF_RXRPC_DEBUG is not set
|
||||
CONFIG_RXKAD=m
|
||||
CONFIG_AF_KCM=m
|
||||
CONFIG_FIB_RULES=y
|
||||
CONFIG_WIRELESS=y
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
|
@ -1649,7 +1667,6 @@ CONFIG_WEXT_PRIV=y
|
|||
CONFIG_CFG80211=m
|
||||
# CONFIG_NL80211_TESTMODE is not set
|
||||
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
|
||||
# CONFIG_CFG80211_REG_DEBUG is not set
|
||||
# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
|
||||
CONFIG_CFG80211_DEFAULT_PS=y
|
||||
CONFIG_CFG80211_DEBUGFS=y
|
||||
|
@ -1734,6 +1751,9 @@ CONFIG_NFC_S3FWRN5=m
|
|||
CONFIG_NFC_S3FWRN5_I2C=m
|
||||
CONFIG_NFC_ST95HF=m
|
||||
CONFIG_LWTUNNEL=y
|
||||
CONFIG_DST_CACHE=y
|
||||
CONFIG_NET_DEVLINK=m
|
||||
CONFIG_MAY_USE_DEVLINK=m
|
||||
CONFIG_HAVE_BPF_JIT=y
|
||||
|
||||
#
|
||||
|
@ -1998,6 +2018,7 @@ CONFIG_VIRTIO_BLK=y
|
|||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
CONFIG_BLK_DEV_RSXX=m
|
||||
CONFIG_NVME_CORE=m
|
||||
CONFIG_BLK_DEV_NVME=m
|
||||
# CONFIG_BLK_DEV_NVME_SCSI is not set
|
||||
|
||||
|
@ -2028,12 +2049,16 @@ CONFIG_HMC6352=m
|
|||
CONFIG_DS1682=m
|
||||
CONFIG_TI_DAC7512=m
|
||||
CONFIG_VMWARE_BALLOON=m
|
||||
CONFIG_BMP085=y
|
||||
CONFIG_BMP085=m
|
||||
CONFIG_BMP085_I2C=m
|
||||
CONFIG_BMP085_SPI=m
|
||||
CONFIG_USB_SWITCH_FSA9480=m
|
||||
CONFIG_LATTICE_ECP3_CONFIG=m
|
||||
CONFIG_SRAM=y
|
||||
CONFIG_PANEL=m
|
||||
CONFIG_PANEL_PARPORT=0
|
||||
CONFIG_PANEL_PROFILE=5
|
||||
# CONFIG_PANEL_CHANGE_MESSAGE is not set
|
||||
CONFIG_C2PORT=m
|
||||
CONFIG_C2PORT_DURAMAR_2150=m
|
||||
|
||||
|
@ -2075,6 +2100,11 @@ CONFIG_INTEL_MIC_BUS=m
|
|||
#
|
||||
CONFIG_SCIF_BUS=m
|
||||
|
||||
#
|
||||
# VOP Bus Driver
|
||||
#
|
||||
CONFIG_VOP_BUS=m
|
||||
|
||||
#
|
||||
# Intel MIC Host Driver
|
||||
#
|
||||
|
@ -2094,6 +2124,11 @@ CONFIG_SCIF=m
|
|||
# Intel MIC Coprocessor State Management (COSM) Drivers
|
||||
#
|
||||
CONFIG_MIC_COSM=m
|
||||
|
||||
#
|
||||
# VOP Driver
|
||||
#
|
||||
CONFIG_VOP=m
|
||||
CONFIG_GENWQE=m
|
||||
CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
|
||||
CONFIG_ECHO=m
|
||||
|
@ -2373,7 +2408,6 @@ CONFIG_DM_CRYPT=m
|
|||
CONFIG_DM_SNAPSHOT=m
|
||||
CONFIG_DM_THIN_PROVISIONING=m
|
||||
CONFIG_DM_CACHE=m
|
||||
CONFIG_DM_CACHE_MQ=m
|
||||
CONFIG_DM_CACHE_SMQ=m
|
||||
CONFIG_DM_CACHE_CLEANER=m
|
||||
CONFIG_DM_ERA=m
|
||||
|
@ -2438,6 +2472,7 @@ CONFIG_MACVTAP=m
|
|||
CONFIG_IPVLAN=m
|
||||
CONFIG_VXLAN=m
|
||||
CONFIG_GENEVE=m
|
||||
CONFIG_MACSEC=m
|
||||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETCONSOLE_DYNAMIC=y
|
||||
CONFIG_NETPOLL=y
|
||||
|
@ -2556,6 +2591,7 @@ CONFIG_TIGON3=m
|
|||
CONFIG_BNX2X=m
|
||||
CONFIG_BNX2X_SRIOV=y
|
||||
CONFIG_BNX2X_VXLAN=y
|
||||
# CONFIG_BNX2X_GENEVE is not set
|
||||
CONFIG_BNXT=m
|
||||
CONFIG_BNXT_SRIOV=y
|
||||
CONFIG_NET_VENDOR_BROCADE=y
|
||||
|
@ -2571,6 +2607,7 @@ CONFIG_CHELSIO_T1_1G=y
|
|||
CONFIG_CHELSIO_T3=m
|
||||
CONFIG_CHELSIO_T4=m
|
||||
CONFIG_CHELSIO_T4_DCB=y
|
||||
# CONFIG_CHELSIO_T4_UWIRE is not set
|
||||
CONFIG_CHELSIO_T4_FCOE=y
|
||||
CONFIG_CHELSIO_T4VF=m
|
||||
CONFIG_NET_VENDOR_CISCO=y
|
||||
|
@ -2611,6 +2648,7 @@ CONFIG_NET_VENDOR_INTEL=y
|
|||
CONFIG_E100=m
|
||||
CONFIG_E1000=m
|
||||
CONFIG_E1000E=m
|
||||
CONFIG_E1000E_HWTS=y
|
||||
CONFIG_IGB=m
|
||||
CONFIG_IGB_HWMON=y
|
||||
CONFIG_IGB_DCA=y
|
||||
|
@ -2634,6 +2672,7 @@ CONFIG_NET_VENDOR_I825XX=y
|
|||
CONFIG_JME=m
|
||||
CONFIG_NET_VENDOR_MARVELL=y
|
||||
CONFIG_MVMDIO=m
|
||||
# CONFIG_MVNETA_BM is not set
|
||||
CONFIG_SKGE=m
|
||||
# CONFIG_SKGE_DEBUG is not set
|
||||
CONFIG_SKGE_GENESIS=y
|
||||
|
@ -2647,6 +2686,8 @@ CONFIG_MLX4_CORE=m
|
|||
CONFIG_MLX4_DEBUG=y
|
||||
CONFIG_MLX5_CORE=m
|
||||
CONFIG_MLX5_CORE_EN=y
|
||||
CONFIG_MLX5_CORE_EN_DCB=y
|
||||
CONFIG_MLX5_CORE_EN_VXLAN=y
|
||||
CONFIG_MLXSW_CORE=m
|
||||
CONFIG_MLXSW_CORE_HWMON=y
|
||||
CONFIG_MLXSW_PCI=m
|
||||
|
@ -2790,7 +2831,9 @@ CONFIG_MICROCHIP_PHY=m
|
|||
CONFIG_FIXED_PHY=y
|
||||
CONFIG_MDIO_BITBANG=m
|
||||
CONFIG_MDIO_GPIO=m
|
||||
CONFIG_MDIO_CAVIUM=m
|
||||
CONFIG_MDIO_OCTEON=m
|
||||
CONFIG_MDIO_THUNDER=m
|
||||
CONFIG_MDIO_BCM_UNIMAC=m
|
||||
CONFIG_MICREL_KS8995MA=m
|
||||
CONFIG_PLIP=m
|
||||
|
@ -2978,6 +3021,7 @@ CONFIG_IWLMVM=m
|
|||
CONFIG_IWLWIFI_OPMODE_MODULAR=y
|
||||
# CONFIG_IWLWIFI_BCAST_FILTERING is not set
|
||||
# CONFIG_IWLWIFI_UAPSD is not set
|
||||
# CONFIG_IWLWIFI_PCIE_RTPM is not set
|
||||
|
||||
#
|
||||
# Debugging Options
|
||||
|
@ -3095,7 +3139,6 @@ CONFIG_WL1251_SDIO=m
|
|||
CONFIG_WL12XX=m
|
||||
CONFIG_WL18XX=m
|
||||
CONFIG_WLCORE=m
|
||||
CONFIG_WLCORE_SPI=m
|
||||
CONFIG_WLCORE_SDIO=m
|
||||
CONFIG_WILINK_PLATFORM_DATA=y
|
||||
CONFIG_WLAN_VENDOR_ZYDAS=y
|
||||
|
@ -3223,10 +3266,6 @@ CONFIG_HISAX_ST5481=m
|
|||
CONFIG_HISAX_HFCUSB=m
|
||||
CONFIG_HISAX_HFC4S8S=m
|
||||
CONFIG_HISAX_FRITZ_PCIPNP=m
|
||||
|
||||
#
|
||||
# Active cards
|
||||
#
|
||||
CONFIG_ISDN_CAPI=m
|
||||
CONFIG_CAPI_TRACE=y
|
||||
CONFIG_ISDN_CAPI_CAPI20=m
|
||||
|
@ -3337,6 +3376,7 @@ CONFIG_KEYBOARD_CROS_EC=m
|
|||
CONFIG_INPUT_MOUSE=y
|
||||
CONFIG_MOUSE_PS2=m
|
||||
CONFIG_MOUSE_PS2_ALPS=y
|
||||
CONFIG_MOUSE_PS2_BYD=y
|
||||
CONFIG_MOUSE_PS2_LOGIPS2PP=y
|
||||
CONFIG_MOUSE_PS2_SYNAPTICS=y
|
||||
CONFIG_MOUSE_PS2_CYPRESS=y
|
||||
|
@ -3432,6 +3472,7 @@ CONFIG_TOUCHSCREEN_WACOM_I2C=m
|
|||
CONFIG_TOUCHSCREEN_MAX11801=m
|
||||
CONFIG_TOUCHSCREEN_MCS5000=m
|
||||
CONFIG_TOUCHSCREEN_MMS114=m
|
||||
CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
|
||||
CONFIG_TOUCHSCREEN_MTOUCH=m
|
||||
CONFIG_TOUCHSCREEN_INEXIO=m
|
||||
CONFIG_TOUCHSCREEN_MK712=m
|
||||
|
@ -3539,6 +3580,13 @@ CONFIG_INPUT_SOC_BUTTON_ARRAY=m
|
|||
CONFIG_INPUT_DRV260X_HAPTICS=m
|
||||
CONFIG_INPUT_DRV2665_HAPTICS=m
|
||||
CONFIG_INPUT_DRV2667_HAPTICS=m
|
||||
CONFIG_RMI4_CORE=m
|
||||
CONFIG_RMI4_I2C=m
|
||||
CONFIG_RMI4_SPI=m
|
||||
CONFIG_RMI4_2D_SENSOR=y
|
||||
CONFIG_RMI4_F11=y
|
||||
CONFIG_RMI4_F12=y
|
||||
CONFIG_RMI4_F30=y
|
||||
|
||||
#
|
||||
# Hardware I/O ports
|
||||
|
@ -3618,6 +3666,7 @@ CONFIG_SERIAL_8250_DW=m
|
|||
CONFIG_SERIAL_8250_RT288X=y
|
||||
CONFIG_SERIAL_8250_FINTEK=m
|
||||
CONFIG_SERIAL_8250_MID=m
|
||||
CONFIG_SERIAL_8250_MOXA=m
|
||||
|
||||
#
|
||||
# Non-8250 serial port support
|
||||
|
@ -3647,6 +3696,7 @@ CONFIG_SERIAL_RP2=m
|
|||
CONFIG_SERIAL_RP2_NR_UARTS=32
|
||||
CONFIG_SERIAL_FSL_LPUART=m
|
||||
CONFIG_SERIAL_MEN_Z135=m
|
||||
# CONFIG_SERIAL_MVEBU_UART is not set
|
||||
CONFIG_TTY_PRINTK=y
|
||||
CONFIG_PRINTER=m
|
||||
# CONFIG_LP_CONSOLE is not set
|
||||
|
@ -3807,24 +3857,24 @@ CONFIG_SPI_MASTER=y
|
|||
# SPI Master Controller Drivers
|
||||
#
|
||||
CONFIG_SPI_ALTERA=m
|
||||
CONFIG_SPI_AXI_SPI_ENGINE=m
|
||||
CONFIG_SPI_BITBANG=m
|
||||
CONFIG_SPI_BUTTERFLY=m
|
||||
CONFIG_SPI_CADENCE=m
|
||||
CONFIG_SPI_DESIGNWARE=m
|
||||
CONFIG_SPI_DW_PCI=m
|
||||
CONFIG_SPI_DW_MID_DMA=y
|
||||
CONFIG_SPI_DW_MMIO=m
|
||||
CONFIG_SPI_DLN2=m
|
||||
CONFIG_SPI_GPIO=m
|
||||
CONFIG_SPI_LM70_LLP=m
|
||||
CONFIG_SPI_OC_TINY=m
|
||||
CONFIG_SPI_PXA2XX_DMA=y
|
||||
CONFIG_SPI_PXA2XX=m
|
||||
CONFIG_SPI_PXA2XX_PCI=m
|
||||
CONFIG_SPI_SC18IS602=m
|
||||
CONFIG_SPI_XCOMM=m
|
||||
# CONFIG_SPI_XILINX is not set
|
||||
CONFIG_SPI_ZYNQMP_GQSPI=m
|
||||
CONFIG_SPI_DESIGNWARE=m
|
||||
CONFIG_SPI_DW_PCI=m
|
||||
CONFIG_SPI_DW_MID_DMA=y
|
||||
CONFIG_SPI_DW_MMIO=m
|
||||
|
||||
#
|
||||
# SPI Protocol Masters
|
||||
|
@ -3904,18 +3954,21 @@ CONFIG_GPIO_DWAPB=m
|
|||
CONFIG_GPIO_GENERIC_PLATFORM=m
|
||||
CONFIG_GPIO_ICH=m
|
||||
CONFIG_GPIO_LYNXPOINT=y
|
||||
CONFIG_GPIO_MENZ127=m
|
||||
CONFIG_GPIO_VX855=m
|
||||
CONFIG_GPIO_ZX=y
|
||||
|
||||
#
|
||||
# Port-mapped I/O GPIO drivers
|
||||
#
|
||||
CONFIG_GPIO_104_DIO_48E=m
|
||||
CONFIG_GPIO_104_IDIO_16=m
|
||||
CONFIG_GPIO_104_IDI_48=m
|
||||
CONFIG_GPIO_F7188X=m
|
||||
CONFIG_GPIO_IT87=m
|
||||
CONFIG_GPIO_SCH=m
|
||||
CONFIG_GPIO_SCH311X=m
|
||||
CONFIG_GPIO_WS16C48=m
|
||||
|
||||
#
|
||||
# I2C GPIO expanders
|
||||
|
@ -3926,6 +3979,7 @@ CONFIG_GPIO_MAX732X=m
|
|||
CONFIG_GPIO_PCA953X=m
|
||||
CONFIG_GPIO_PCF857X=m
|
||||
CONFIG_GPIO_SX150X=y
|
||||
CONFIG_GPIO_TPIC2810=m
|
||||
|
||||
#
|
||||
# MFD GPIO expanders
|
||||
|
@ -3941,6 +3995,8 @@ CONFIG_GPIO_KEMPLD=m
|
|||
CONFIG_GPIO_LP3943=m
|
||||
CONFIG_GPIO_PALMAS=y
|
||||
CONFIG_GPIO_RC5T583=y
|
||||
CONFIG_GPIO_TPS65086=m
|
||||
CONFIG_GPIO_TPS65218=m
|
||||
CONFIG_GPIO_TPS6586X=y
|
||||
CONFIG_GPIO_TPS65910=y
|
||||
CONFIG_GPIO_TPS65912=m
|
||||
|
@ -3964,6 +4020,7 @@ CONFIG_GPIO_RDC321X=m
|
|||
#
|
||||
CONFIG_GPIO_MAX7301=m
|
||||
CONFIG_GPIO_MC33880=m
|
||||
CONFIG_GPIO_PISOSR=m
|
||||
|
||||
#
|
||||
# SPI or I2C GPIO expanders
|
||||
|
@ -4118,6 +4175,7 @@ CONFIG_SENSORS_JC42=m
|
|||
CONFIG_SENSORS_POWR1220=m
|
||||
CONFIG_SENSORS_LINEAGE=m
|
||||
CONFIG_SENSORS_LTC2945=m
|
||||
CONFIG_SENSORS_LTC2990=m
|
||||
CONFIG_SENSORS_LTC4151=m
|
||||
CONFIG_SENSORS_LTC4215=m
|
||||
CONFIG_SENSORS_LTC4222=m
|
||||
|
@ -4275,6 +4333,7 @@ CONFIG_ACQUIRE_WDT=m
|
|||
CONFIG_ADVANTECH_WDT=m
|
||||
CONFIG_ALIM1535_WDT=m
|
||||
CONFIG_ALIM7101_WDT=m
|
||||
CONFIG_EBC_C384_WDT=m
|
||||
CONFIG_F71808E_WDT=m
|
||||
CONFIG_SP5100_TCO=m
|
||||
CONFIG_SBC_FITPC2_WATCHDOG=m
|
||||
|
@ -4304,7 +4363,8 @@ CONFIG_W83877F_WDT=m
|
|||
CONFIG_W83977F_WDT=m
|
||||
CONFIG_MACHZ_WDT=m
|
||||
CONFIG_SBC_EPX_C3_WATCHDOG=m
|
||||
CONFIG_BCM7038_WDT=m
|
||||
CONFIG_INTEL_MEI_WDT=m
|
||||
CONFIG_NI903X_WDT=m
|
||||
CONFIG_MEN_A21_WDT=m
|
||||
CONFIG_XEN_WDT=m
|
||||
|
||||
|
@ -4361,7 +4421,8 @@ CONFIG_MFD_AS3711=y
|
|||
CONFIG_PMIC_ADP5520=y
|
||||
CONFIG_MFD_AAT2870_CORE=y
|
||||
CONFIG_MFD_BCM590XX=m
|
||||
CONFIG_MFD_AXP20X=y
|
||||
CONFIG_MFD_AXP20X=m
|
||||
CONFIG_MFD_AXP20X_I2C=m
|
||||
CONFIG_MFD_CROS_EC=m
|
||||
CONFIG_MFD_CROS_EC_I2C=m
|
||||
CONFIG_MFD_CROS_EC_SPI=m
|
||||
|
@ -4430,6 +4491,7 @@ CONFIG_MFD_PALMAS=y
|
|||
CONFIG_TPS6105X=m
|
||||
CONFIG_TPS65010=m
|
||||
CONFIG_TPS6507X=m
|
||||
CONFIG_MFD_TPS65086=m
|
||||
CONFIG_MFD_TPS65090=y
|
||||
CONFIG_MFD_TPS65217=m
|
||||
CONFIG_MFD_TPS65218=m
|
||||
|
@ -4530,6 +4592,7 @@ CONFIG_REGULATOR_TPS6105X=m
|
|||
CONFIG_REGULATOR_TPS62360=m
|
||||
CONFIG_REGULATOR_TPS65023=m
|
||||
CONFIG_REGULATOR_TPS6507X=m
|
||||
CONFIG_REGULATOR_TPS65086=m
|
||||
CONFIG_REGULATOR_TPS65090=m
|
||||
CONFIG_REGULATOR_TPS65217=m
|
||||
CONFIG_REGULATOR_TPS6524X=m
|
||||
|
@ -5226,6 +5289,7 @@ CONFIG_VGA_ARB_MAX_GPUS=16
|
|||
CONFIG_VGA_SWITCHEROO=y
|
||||
CONFIG_DRM=m
|
||||
CONFIG_DRM_MIPI_DSI=y
|
||||
# CONFIG_DRM_DP_AUX_CHARDEV is not set
|
||||
CONFIG_DRM_KMS_HELPER=m
|
||||
CONFIG_DRM_KMS_FB_HELPER=y
|
||||
CONFIG_DRM_FBDEV_EMULATION=y
|
||||
|
@ -5247,6 +5311,11 @@ CONFIG_DRM_AMDGPU=m
|
|||
# CONFIG_DRM_AMDGPU_CIK is not set
|
||||
CONFIG_DRM_AMDGPU_USERPTR=y
|
||||
# CONFIG_DRM_AMD_POWERPLAY is not set
|
||||
|
||||
#
|
||||
# ACP (Audio CoProcessor) Configuration
|
||||
#
|
||||
# CONFIG_DRM_AMD_ACP is not set
|
||||
CONFIG_DRM_NOUVEAU=m
|
||||
CONFIG_NOUVEAU_DEBUG=5
|
||||
CONFIG_NOUVEAU_DEBUG_DEFAULT=3
|
||||
|
@ -5254,6 +5323,7 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
|
|||
CONFIG_DRM_I810=m
|
||||
CONFIG_DRM_I915=m
|
||||
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
|
||||
CONFIG_DRM_I915_USERPTR=y
|
||||
CONFIG_DRM_MGA=m
|
||||
CONFIG_DRM_SIS=m
|
||||
CONFIG_DRM_VIA=m
|
||||
|
@ -5465,11 +5535,13 @@ CONFIG_SOUND_OSS_CORE=y
|
|||
CONFIG_SND=m
|
||||
CONFIG_SND_TIMER=m
|
||||
CONFIG_SND_PCM=m
|
||||
CONFIG_SND_PCM_ELD=y
|
||||
CONFIG_SND_DMAENGINE_PCM=m
|
||||
CONFIG_SND_HWDEP=m
|
||||
CONFIG_SND_RAWMIDI=m
|
||||
CONFIG_SND_COMPRESS_OFFLOAD=m
|
||||
CONFIG_SND_JACK=y
|
||||
CONFIG_SND_JACK_INPUT_DEV=y
|
||||
CONFIG_SND_SEQUENCER=m
|
||||
CONFIG_SND_SEQ_DUMMY=m
|
||||
CONFIG_SND_OSSEMUL=y
|
||||
|
@ -5701,11 +5773,14 @@ CONFIG_SND_SOC_CS4349=m
|
|||
CONFIG_SND_SOC_DMIC=m
|
||||
CONFIG_SND_SOC_ES8328=m
|
||||
CONFIG_SND_SOC_GTM601=m
|
||||
CONFIG_SND_SOC_HDAC_HDMI=m
|
||||
CONFIG_SND_SOC_INNO_RK3036=m
|
||||
CONFIG_SND_SOC_MAX98090=m
|
||||
CONFIG_SND_SOC_MAX98357A=m
|
||||
CONFIG_SND_SOC_PCM1681=m
|
||||
CONFIG_SND_SOC_PCM179X=m
|
||||
CONFIG_SND_SOC_PCM179X_I2C=m
|
||||
CONFIG_SND_SOC_PCM179X_SPI=m
|
||||
CONFIG_SND_SOC_PCM3168A=m
|
||||
CONFIG_SND_SOC_PCM3168A_I2C=m
|
||||
CONFIG_SND_SOC_PCM3168A_SPI=m
|
||||
|
@ -5715,6 +5790,7 @@ CONFIG_SND_SOC_PCM512x_SPI=m
|
|||
CONFIG_SND_SOC_RL6231=m
|
||||
CONFIG_SND_SOC_RL6347A=m
|
||||
CONFIG_SND_SOC_RT286=m
|
||||
CONFIG_SND_SOC_RT5616=m
|
||||
CONFIG_SND_SOC_RT5631=m
|
||||
CONFIG_SND_SOC_RT5640=m
|
||||
CONFIG_SND_SOC_RT5645=m
|
||||
|
@ -5793,6 +5869,7 @@ CONFIG_HID_CHERRY=m
|
|||
CONFIG_HID_CHICONY=m
|
||||
CONFIG_HID_CORSAIR=m
|
||||
CONFIG_HID_PRODIKEYS=m
|
||||
CONFIG_HID_CMEDIA=m
|
||||
CONFIG_HID_CP2112=m
|
||||
CONFIG_HID_CYPRESS=m
|
||||
CONFIG_HID_DRAGONRISE=m
|
||||
|
@ -6375,6 +6452,7 @@ CONFIG_INFINIBAND_QIB_DCA=y
|
|||
CONFIG_INFINIBAND_CXGB3=m
|
||||
# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
|
||||
CONFIG_INFINIBAND_CXGB4=m
|
||||
CONFIG_INFINIBAND_I40IW=m
|
||||
CONFIG_MLX4_INFINIBAND=m
|
||||
CONFIG_MLX5_INFINIBAND=m
|
||||
CONFIG_INFINIBAND_NES=m
|
||||
|
@ -6388,6 +6466,7 @@ CONFIG_INFINIBAND_SRP=m
|
|||
CONFIG_INFINIBAND_SRPT=m
|
||||
CONFIG_INFINIBAND_ISER=m
|
||||
CONFIG_INFINIBAND_ISERT=m
|
||||
CONFIG_INFINIBAND_RDMAVT=m
|
||||
CONFIG_EDAC_ATOMIC_SCRUB=y
|
||||
CONFIG_EDAC_SUPPORT=y
|
||||
CONFIG_EDAC=y
|
||||
|
@ -6434,10 +6513,10 @@ CONFIG_RTC_DRV_88PM80X=m
|
|||
CONFIG_RTC_DRV_ABB5ZES3=m
|
||||
CONFIG_RTC_DRV_ABX80X=m
|
||||
CONFIG_RTC_DRV_DS1307=m
|
||||
CONFIG_RTC_DRV_DS1307_HWMON=y
|
||||
CONFIG_RTC_DRV_DS1374=m
|
||||
CONFIG_RTC_DRV_DS1374_WDT=y
|
||||
CONFIG_RTC_DRV_DS1672=m
|
||||
CONFIG_RTC_DRV_DS3232=m
|
||||
CONFIG_RTC_DRV_LP8788=m
|
||||
CONFIG_RTC_DRV_MAX6900=m
|
||||
CONFIG_RTC_DRV_MAX8907=m
|
||||
|
@ -6449,16 +6528,15 @@ CONFIG_RTC_DRV_ISL1208=m
|
|||
CONFIG_RTC_DRV_ISL12022=m
|
||||
CONFIG_RTC_DRV_ISL12057=m
|
||||
CONFIG_RTC_DRV_X1205=m
|
||||
CONFIG_RTC_DRV_PALMAS=m
|
||||
CONFIG_RTC_DRV_PCF2127=m
|
||||
CONFIG_RTC_DRV_PCF8523=m
|
||||
CONFIG_RTC_DRV_PCF8563=m
|
||||
CONFIG_RTC_DRV_PCF85063=m
|
||||
CONFIG_RTC_DRV_PCF8563=m
|
||||
CONFIG_RTC_DRV_PCF8583=m
|
||||
CONFIG_RTC_DRV_M41T80=m
|
||||
CONFIG_RTC_DRV_M41T80_WDT=y
|
||||
CONFIG_RTC_DRV_BQ32K=m
|
||||
CONFIG_RTC_DRV_TWL4030=m
|
||||
CONFIG_RTC_DRV_PALMAS=m
|
||||
CONFIG_RTC_DRV_TPS6586X=m
|
||||
CONFIG_RTC_DRV_TPS65910=m
|
||||
CONFIG_RTC_DRV_TPS80031=m
|
||||
|
@ -6470,6 +6548,7 @@ CONFIG_RTC_DRV_RX8581=m
|
|||
CONFIG_RTC_DRV_RX8025=m
|
||||
CONFIG_RTC_DRV_EM3027=m
|
||||
CONFIG_RTC_DRV_RV3029C2=m
|
||||
CONFIG_RTC_DRV_RV3029_HWMON=y
|
||||
CONFIG_RTC_DRV_RV8803=m
|
||||
CONFIG_RTC_DRV_S5M=m
|
||||
|
||||
|
@ -6482,13 +6561,20 @@ CONFIG_RTC_DRV_DS1305=m
|
|||
CONFIG_RTC_DRV_DS1343=m
|
||||
CONFIG_RTC_DRV_DS1347=m
|
||||
CONFIG_RTC_DRV_DS1390=m
|
||||
CONFIG_RTC_DRV_MAX6902=m
|
||||
CONFIG_RTC_DRV_R9701=m
|
||||
CONFIG_RTC_DRV_RS5C348=m
|
||||
CONFIG_RTC_DRV_DS3234=m
|
||||
CONFIG_RTC_DRV_PCF2123=m
|
||||
CONFIG_RTC_DRV_RX4581=m
|
||||
CONFIG_RTC_DRV_RX6110=m
|
||||
CONFIG_RTC_DRV_RS5C348=m
|
||||
CONFIG_RTC_DRV_MAX6902=m
|
||||
CONFIG_RTC_DRV_PCF2123=m
|
||||
CONFIG_RTC_DRV_MCP795=m
|
||||
CONFIG_RTC_I2C_AND_SPI=y
|
||||
|
||||
#
|
||||
# SPI and I2C RTC drivers
|
||||
#
|
||||
CONFIG_RTC_DRV_DS3232=m
|
||||
CONFIG_RTC_DRV_PCF2127=m
|
||||
|
||||
#
|
||||
# Platform RTC drivers
|
||||
|
@ -6546,6 +6632,8 @@ CONFIG_DMA_ACPI=y
|
|||
CONFIG_INTEL_IDMA64=m
|
||||
CONFIG_INTEL_IOATDMA=m
|
||||
CONFIG_INTEL_MIC_X100_DMA=m
|
||||
CONFIG_QCOM_HIDMA_MGMT=m
|
||||
CONFIG_QCOM_HIDMA=m
|
||||
CONFIG_DW_DMAC_CORE=m
|
||||
CONFIG_DW_DMAC=m
|
||||
CONFIG_DW_DMAC_PCI=m
|
||||
|
@ -6582,6 +6670,7 @@ CONFIG_VFIO_PCI=m
|
|||
CONFIG_VFIO_PCI_VGA=y
|
||||
CONFIG_VFIO_PCI_MMAP=y
|
||||
CONFIG_VFIO_PCI_INTX=y
|
||||
CONFIG_VFIO_PCI_IGD=y
|
||||
CONFIG_IRQ_BYPASS_MANAGER=m
|
||||
CONFIG_VIRT_DRIVERS=y
|
||||
CONFIG_VIRTIO=y
|
||||
|
@ -6773,10 +6862,6 @@ CONFIG_COMEDI_ISADMA=m
|
|||
CONFIG_COMEDI_NI_LABPC=m
|
||||
CONFIG_COMEDI_NI_LABPC_ISADMA=m
|
||||
CONFIG_COMEDI_NI_TIO=m
|
||||
CONFIG_PANEL=m
|
||||
CONFIG_PANEL_PARPORT=0
|
||||
CONFIG_PANEL_PROFILE=5
|
||||
# CONFIG_PANEL_CHANGE_MESSAGE is not set
|
||||
CONFIG_RTL8192U=m
|
||||
CONFIG_RTLLIB=m
|
||||
CONFIG_RTLLIB_CRYPTO_CCMP=m
|
||||
|
@ -6858,13 +6943,6 @@ CONFIG_SENSORS_ISL29028=m
|
|||
CONFIG_TSL2583=m
|
||||
CONFIG_TSL2x7x=m
|
||||
|
||||
#
|
||||
# Magnetometer sensors
|
||||
#
|
||||
CONFIG_SENSORS_HMC5843=m
|
||||
CONFIG_SENSORS_HMC5843_I2C=m
|
||||
CONFIG_SENSORS_HMC5843_SPI=m
|
||||
|
||||
#
|
||||
# Active energy metering IC
|
||||
#
|
||||
|
@ -6886,7 +6964,6 @@ CONFIG_AD2S1210=m
|
|||
#
|
||||
# Triggers - standalone
|
||||
#
|
||||
CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
|
||||
CONFIG_FB_SM750=m
|
||||
CONFIG_FB_XGI=m
|
||||
|
||||
|
@ -6905,12 +6982,10 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
|
|||
CONFIG_SPEAKUP_SYNTH_SPKOUT=m
|
||||
CONFIG_SPEAKUP_SYNTH_TXPRT=m
|
||||
CONFIG_SPEAKUP_SYNTH_DUMMY=m
|
||||
CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
|
||||
CONFIG_STAGING_MEDIA=y
|
||||
CONFIG_I2C_BCM2048=m
|
||||
CONFIG_DVB_CXD2099=m
|
||||
CONFIG_DVB_MN88472=m
|
||||
CONFIG_DVB_MN88473=m
|
||||
CONFIG_LIRC_STAGING=y
|
||||
CONFIG_LIRC_BT829=m
|
||||
CONFIG_LIRC_IMON=m
|
||||
|
@ -6925,27 +7000,22 @@ CONFIG_INFINIBAND_HFI1=m
|
|||
# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
|
||||
CONFIG_HFI1_VERBS_31BIT_PSN=y
|
||||
# CONFIG_SDMA_VERBOSITY is not set
|
||||
# CONFIG_PRESCAN_RXQ is not set
|
||||
|
||||
#
|
||||
# Android
|
||||
#
|
||||
CONFIG_WIMAX_GDM72XX=m
|
||||
CONFIG_WIMAX_GDM72XX_QOS=y
|
||||
CONFIG_WIMAX_GDM72XX_K_MODE=y
|
||||
CONFIG_WIMAX_GDM72XX_WIMAX2=y
|
||||
CONFIG_WIMAX_GDM72XX_USB=y
|
||||
# CONFIG_WIMAX_GDM72XX_SDIO is not set
|
||||
CONFIG_WIMAX_GDM72XX_USB_PM=y
|
||||
CONFIG_LTE_GDM724X=m
|
||||
CONFIG_FIREWIRE_SERIAL=m
|
||||
CONFIG_FWTTY_MAX_TOTAL_PORTS=64
|
||||
CONFIG_FWTTY_MAX_CARD_PORTS=32
|
||||
CONFIG_MTD_SPINAND_MT29F=m
|
||||
CONFIG_MTD_SPINAND_ONDIEECC=y
|
||||
CONFIG_LNET=m
|
||||
CONFIG_LNET_MAX_PAYLOAD=1048576
|
||||
# CONFIG_LNET_SELFTEST is not set
|
||||
CONFIG_LNET_XPRT_IB=m
|
||||
# CONFIG_LUSTRE_FS is not set
|
||||
CONFIG_DGNC=m
|
||||
CONFIG_DGAP=m
|
||||
CONFIG_GS_FPGABOOT=m
|
||||
CONFIG_CRYPTO_SKEIN=y
|
||||
CONFIG_UNISYSSPAR=y
|
||||
|
@ -6972,7 +7042,9 @@ CONFIG_FB_TFT_RA8875=m
|
|||
CONFIG_FB_TFT_S6D02A1=m
|
||||
CONFIG_FB_TFT_S6D1121=m
|
||||
CONFIG_FB_TFT_SSD1289=m
|
||||
CONFIG_FB_TFT_SSD1305=m
|
||||
CONFIG_FB_TFT_SSD1306=m
|
||||
CONFIG_FB_TFT_SSD1325=m
|
||||
CONFIG_FB_TFT_SSD1331=m
|
||||
CONFIG_FB_TFT_SSD1351=m
|
||||
CONFIG_FB_TFT_ST7735R=m
|
||||
|
@ -6998,11 +7070,16 @@ CONFIG_AIM_V4L2=m
|
|||
CONFIG_HDM_DIM2=m
|
||||
CONFIG_HDM_I2C=m
|
||||
CONFIG_HDM_USB=m
|
||||
|
||||
#
|
||||
# Old ISDN4Linux (deprecated)
|
||||
#
|
||||
CONFIG_X86_PLATFORM_DEVICES=y
|
||||
CONFIG_ACER_WMI=m
|
||||
CONFIG_ACERHDF=m
|
||||
CONFIG_ALIENWARE_WMI=m
|
||||
CONFIG_ASUS_LAPTOP=m
|
||||
CONFIG_DELL_SMBIOS=m
|
||||
CONFIG_DELL_LAPTOP=m
|
||||
CONFIG_DELL_WMI=m
|
||||
CONFIG_DELL_WMI_AIO=m
|
||||
|
@ -7073,6 +7150,7 @@ CONFIG_COMMON_CLK=y
|
|||
#
|
||||
CONFIG_COMMON_CLK_WM831X=m
|
||||
CONFIG_COMMON_CLK_SI5351=m
|
||||
CONFIG_COMMON_CLK_CDCE706=m
|
||||
CONFIG_COMMON_CLK_CS2000_CP=m
|
||||
CONFIG_COMMON_CLK_S2MPS11=m
|
||||
CONFIG_CLK_TWL6040=m
|
||||
|
@ -7080,7 +7158,6 @@ CONFIG_CLK_TWL6040=m
|
|||
CONFIG_COMMON_CLK_PALMAS=m
|
||||
CONFIG_COMMON_CLK_PWM=m
|
||||
# CONFIG_COMMON_CLK_PXA is not set
|
||||
CONFIG_COMMON_CLK_CDCE706=m
|
||||
|
||||
#
|
||||
# Hardware Spinlock drivers
|
||||
|
@ -7230,7 +7307,9 @@ CONFIG_PALMAS_GPADC=m
|
|||
CONFIG_QCOM_SPMI_IADC=m
|
||||
CONFIG_QCOM_SPMI_VADC=m
|
||||
CONFIG_TI_ADC081C=m
|
||||
CONFIG_TI_ADC0832=m
|
||||
CONFIG_TI_ADC128S052=m
|
||||
CONFIG_TI_ADS1015=m
|
||||
CONFIG_TI_AM335X_ADC=m
|
||||
CONFIG_TWL4030_MADC=m
|
||||
CONFIG_TWL6030_GPADC=m
|
||||
|
@ -7244,6 +7323,7 @@ CONFIG_AD8366=m
|
|||
#
|
||||
# Chemical Sensors
|
||||
#
|
||||
CONFIG_ATLAS_PH_SENSOR=m
|
||||
CONFIG_IAQCORE=m
|
||||
CONFIG_VZ89X=m
|
||||
|
||||
|
@ -7276,6 +7356,7 @@ CONFIG_AD5504=m
|
|||
CONFIG_AD5624R_SPI=m
|
||||
CONFIG_AD5686=m
|
||||
CONFIG_AD5755=m
|
||||
CONFIG_AD5761=m
|
||||
CONFIG_AD5764=m
|
||||
CONFIG_AD5791=m
|
||||
CONFIG_AD7303=m
|
||||
|
@ -7323,8 +7404,14 @@ CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
|
|||
CONFIG_ITG3200=m
|
||||
|
||||
#
|
||||
# Health sensors
|
||||
# Health Sensors
|
||||
#
|
||||
|
||||
#
|
||||
# Heart Rate Monitors
|
||||
#
|
||||
CONFIG_AFE4403=m
|
||||
CONFIG_AFE4404=m
|
||||
CONFIG_MAX30100=m
|
||||
|
||||
#
|
||||
|
@ -7343,6 +7430,8 @@ CONFIG_ADIS16400=m
|
|||
CONFIG_ADIS16480=m
|
||||
CONFIG_KMX61=m
|
||||
CONFIG_INV_MPU6050_IIO=m
|
||||
CONFIG_INV_MPU6050_I2C=m
|
||||
CONFIG_INV_MPU6050_SPI=m
|
||||
CONFIG_IIO_ADIS_LIB=m
|
||||
CONFIG_IIO_ADIS_LIB_BUFFER=y
|
||||
|
||||
|
@ -7389,6 +7478,9 @@ CONFIG_MMC35240=m
|
|||
CONFIG_IIO_ST_MAGN_3AXIS=m
|
||||
CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
|
||||
CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
|
||||
CONFIG_SENSORS_HMC5843=m
|
||||
CONFIG_SENSORS_HMC5843_I2C=m
|
||||
CONFIG_SENSORS_HMC5843_SPI=m
|
||||
|
||||
#
|
||||
# Inclinometer sensors
|
||||
|
@ -7407,6 +7499,7 @@ CONFIG_IIO_SYSFS_TRIGGER=m
|
|||
# Digital potentiometers
|
||||
#
|
||||
CONFIG_MCP4531=m
|
||||
CONFIG_TPL0102=m
|
||||
|
||||
#
|
||||
# Pressure sensors
|
||||
|
@ -7414,6 +7507,8 @@ CONFIG_MCP4531=m
|
|||
CONFIG_BMP280=m
|
||||
CONFIG_HID_SENSOR_PRESS=m
|
||||
CONFIG_MPL115=m
|
||||
CONFIG_MPL115_I2C=m
|
||||
CONFIG_MPL115_SPI=m
|
||||
CONFIG_MPL3115=m
|
||||
CONFIG_MS5611=m
|
||||
CONFIG_MS5611_I2C=m
|
||||
|
@ -7478,7 +7573,6 @@ CONFIG_PWM_PCA9685=m
|
|||
CONFIG_PWM_TWL=m
|
||||
CONFIG_PWM_TWL_LED=m
|
||||
CONFIG_ARM_GIC_MAX_NR=1
|
||||
CONFIG_TS4800_IRQ=m
|
||||
CONFIG_IPACK_BUS=m
|
||||
CONFIG_BOARD_TPCI200=m
|
||||
CONFIG_SERIAL_IPOCTAL=m
|
||||
|
@ -7529,6 +7623,7 @@ CONFIG_NVMEM=m
|
|||
CONFIG_STM=m
|
||||
CONFIG_STM_DUMMY=m
|
||||
CONFIG_STM_SOURCE_CONSOLE=m
|
||||
CONFIG_STM_SOURCE_HEARTBEAT=m
|
||||
CONFIG_INTEL_TH=m
|
||||
CONFIG_INTEL_TH_PCI=m
|
||||
CONFIG_INTEL_TH_GTH=m
|
||||
|
@ -7556,6 +7651,8 @@ CONFIG_DMI_SYSFS=m
|
|||
CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
|
||||
CONFIG_ISCSI_IBFT_FIND=y
|
||||
CONFIG_ISCSI_IBFT=m
|
||||
CONFIG_FW_CFG_SYSFS=m
|
||||
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
|
||||
# CONFIG_GOOGLE_FIRMWARE is not set
|
||||
|
||||
#
|
||||
|
@ -7632,6 +7729,7 @@ CONFIG_FS_POSIX_ACL=y
|
|||
CONFIG_EXPORTFS=y
|
||||
CONFIG_FILE_LOCKING=y
|
||||
CONFIG_MANDATORY_FILE_LOCKING=y
|
||||
CONFIG_FS_ENCRYPTION=m
|
||||
CONFIG_FSNOTIFY=y
|
||||
CONFIG_DNOTIFY=y
|
||||
CONFIG_INOTIFY_USER=y
|
||||
|
@ -7680,6 +7778,7 @@ CONFIG_MSDOS_FS=m
|
|||
CONFIG_VFAT_FS=y
|
||||
CONFIG_FAT_DEFAULT_CODEPAGE=437
|
||||
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
|
||||
# CONFIG_FAT_DEFAULT_UTF8 is not set
|
||||
CONFIG_NTFS_FS=m
|
||||
# CONFIG_NTFS_DEBUG is not set
|
||||
# CONFIG_NTFS_RW is not set
|
||||
|
@ -7703,6 +7802,7 @@ CONFIG_HUGETLB_PAGE=y
|
|||
CONFIG_CONFIGFS_FS=m
|
||||
CONFIG_EFIVAR_FS=y
|
||||
CONFIG_MISC_FILESYSTEMS=y
|
||||
CONFIG_ORANGEFS_FS=m
|
||||
CONFIG_ADFS_FS=m
|
||||
# CONFIG_ADFS_FS_RW is not set
|
||||
CONFIG_AFFS_FS=m
|
||||
|
@ -7802,7 +7902,8 @@ CONFIG_NFSD_V2_ACL=y
|
|||
CONFIG_NFSD_V3=y
|
||||
CONFIG_NFSD_V3_ACL=y
|
||||
CONFIG_NFSD_V4=y
|
||||
CONFIG_NFSD_PNFS=y
|
||||
# CONFIG_NFSD_BLOCKLAYOUT is not set
|
||||
# CONFIG_NFSD_SCSILAYOUT is not set
|
||||
CONFIG_NFSD_V4_SECURITY_LABEL=y
|
||||
# CONFIG_NFSD_FAULT_INJECTION is not set
|
||||
CONFIG_GRACE_PERIOD=m
|
||||
|
@ -7935,6 +8036,7 @@ CONFIG_DEBUG_FS=y
|
|||
CONFIG_SECTION_MISMATCH_WARN_ONLY=y
|
||||
CONFIG_ARCH_WANT_FRAME_POINTERS=y
|
||||
CONFIG_FRAME_POINTER=y
|
||||
# CONFIG_STACK_VALIDATION is not set
|
||||
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
|
||||
CONFIG_MAGIC_SYSRQ=y
|
||||
CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
|
||||
|
@ -7945,6 +8047,8 @@ CONFIG_DEBUG_KERNEL=y
|
|||
#
|
||||
# CONFIG_PAGE_EXTENSION is not set
|
||||
# CONFIG_DEBUG_PAGEALLOC is not set
|
||||
# CONFIG_PAGE_POISONING is not set
|
||||
# CONFIG_DEBUG_PAGE_REF is not set
|
||||
# CONFIG_DEBUG_OBJECTS is not set
|
||||
# CONFIG_SLUB_DEBUG_ON is not set
|
||||
# CONFIG_SLUB_STATS is not set
|
||||
|
@ -7961,6 +8065,8 @@ CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
|
|||
CONFIG_HAVE_ARCH_KMEMCHECK=y
|
||||
CONFIG_HAVE_ARCH_KASAN=y
|
||||
# CONFIG_KASAN is not set
|
||||
CONFIG_ARCH_HAS_KCOV=y
|
||||
# CONFIG_KCOV is not set
|
||||
# CONFIG_DEBUG_SHIRQ is not set
|
||||
|
||||
#
|
||||
|
@ -8021,6 +8127,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
|
|||
# CONFIG_RCU_EQS_DEBUG is not set
|
||||
# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
|
||||
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
|
||||
# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
|
||||
CONFIG_NOTIFIER_ERROR_INJECTION=m
|
||||
CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
|
||||
CONFIG_PM_NOTIFIER_ERROR_INJECT=m
|
||||
|
@ -8095,6 +8202,7 @@ CONFIG_TEST_HEXDUMP=m
|
|||
CONFIG_TEST_STRING_HELPERS=m
|
||||
CONFIG_TEST_KSTRTOX=m
|
||||
CONFIG_TEST_PRINTF=m
|
||||
CONFIG_TEST_BITMAP=m
|
||||
# CONFIG_TEST_RHASHTABLE is not set
|
||||
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
|
||||
# CONFIG_DMA_API_DEBUG is not set
|
||||
|
@ -8127,7 +8235,6 @@ CONFIG_EARLY_PRINTK_EFI=y
|
|||
# CONFIG_X86_PTDUMP_CORE is not set
|
||||
# CONFIG_X86_PTDUMP is not set
|
||||
# CONFIG_EFI_PGT_DUMP is not set
|
||||
CONFIG_DEBUG_RODATA=y
|
||||
# CONFIG_DEBUG_RODATA_TEST is not set
|
||||
# CONFIG_DEBUG_WX is not set
|
||||
CONFIG_DEBUG_SET_MODULE_RONX=y
|
||||
|
@ -8152,7 +8259,6 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=1
|
|||
CONFIG_OPTIMIZE_INLINING=y
|
||||
# CONFIG_DEBUG_ENTRY is not set
|
||||
# CONFIG_DEBUG_NMI_SELFTEST is not set
|
||||
# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
|
||||
CONFIG_X86_DEBUG_FPU=y
|
||||
CONFIG_PUNIT_ATOM_DEBUG=m
|
||||
|
||||
|
@ -8248,11 +8354,9 @@ CONFIG_CRYPTO_HASH2=y
|
|||
CONFIG_CRYPTO_RNG=y
|
||||
CONFIG_CRYPTO_RNG2=y
|
||||
CONFIG_CRYPTO_RNG_DEFAULT=m
|
||||
CONFIG_CRYPTO_PCOMP=m
|
||||
CONFIG_CRYPTO_PCOMP2=y
|
||||
CONFIG_CRYPTO_AKCIPHER2=y
|
||||
CONFIG_CRYPTO_AKCIPHER=m
|
||||
CONFIG_CRYPTO_RSA=m
|
||||
CONFIG_CRYPTO_AKCIPHER=y
|
||||
CONFIG_CRYPTO_RSA=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_MANAGER2=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
|
@ -8372,7 +8476,6 @@ CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
|
|||
# Compression
|
||||
#
|
||||
CONFIG_CRYPTO_DEFLATE=m
|
||||
CONFIG_CRYPTO_ZLIB=m
|
||||
CONFIG_CRYPTO_LZO=y
|
||||
CONFIG_CRYPTO_842=m
|
||||
CONFIG_CRYPTO_LZ4=m
|
||||
|
@ -8410,7 +8513,6 @@ CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
|
|||
CONFIG_CRYPTO_DEV_QAT_C62XVF=m
|
||||
CONFIG_ASYMMETRIC_KEY_TYPE=y
|
||||
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
|
||||
CONFIG_PUBLIC_KEY_ALGO_RSA=y
|
||||
CONFIG_X509_CERTIFICATE_PARSER=y
|
||||
CONFIG_PKCS7_MESSAGE_PARSER=y
|
||||
CONFIG_PKCS7_TEST_KEY=m
|
||||
|
@ -8421,6 +8523,7 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y
|
|||
#
|
||||
CONFIG_SYSTEM_TRUSTED_KEYRING=y
|
||||
CONFIG_SYSTEM_TRUSTED_KEYS=""
|
||||
# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
|
||||
CONFIG_HAVE_KVM=y
|
||||
CONFIG_HAVE_KVM_IRQCHIP=y
|
||||
CONFIG_HAVE_KVM_IRQFD=y
|
|
@ -225,7 +225,7 @@ (define* (kernel-config system #:key variant)
|
|||
(search-path %load-path file)))
|
||||
|
||||
(define-public linux-libre
|
||||
(let* ((version "4.5.5")
|
||||
(let* ((version "4.6.1")
|
||||
(build-phase
|
||||
'(lambda* (#:key system inputs #:allow-other-keys #:rest args)
|
||||
;; Avoid introducing timestamps
|
||||
|
@ -303,7 +303,7 @@ (define-public linux-libre
|
|||
(uri (linux-libre-urls version))
|
||||
(sha256
|
||||
(base32
|
||||
"1zys74hfdi13yyk17x45hvvbx7m97wk7pala3cd8k93xbq8qnai0"))))
|
||||
"16cwr2jhd688bxdjfjpymap7sq0qsl24k5dylbz1rwfblnv2wn51"))))
|
||||
(build-system gnu-build-system)
|
||||
(supported-systems '("x86_64-linux" "i686-linux"))
|
||||
(native-inputs `(("perl" ,perl)
|
||||
|
@ -340,13 +340,13 @@ (define-public linux-libre
|
|||
(define-public linux-libre-4.4
|
||||
(package
|
||||
(inherit linux-libre)
|
||||
(version "4.4.11")
|
||||
(version "4.4.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (linux-libre-urls version))
|
||||
(sha256
|
||||
(base32
|
||||
"17pb9w72vigdrhm8hnkdyw9kwc2l06nabzygpdkwbvf7fg3j03vc"))))
|
||||
"1zbds4ihk4x3lxr1jw7yrjzv1dkl995m41a54dfgqm0kj70li8ws"))))
|
||||
(native-inputs
|
||||
(let ((conf (kernel-config (or (%current-target-system)
|
||||
(%current-system))
|
||||
|
@ -357,13 +357,13 @@ (define-public linux-libre-4.4
|
|||
(define-public linux-libre-4.1
|
||||
(package
|
||||
(inherit linux-libre)
|
||||
(version "4.1.24")
|
||||
(version "4.1.25")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (linux-libre-urls version))
|
||||
(sha256
|
||||
(base32
|
||||
"14jlnq0k86bl4wj8shmvgf34w90bbm9in44j1pdjwwvn169zh9ra"))))
|
||||
"1vpgcnmfnn005rcd60wyyg0f84fgapdmz2dpcy77p2l66mw4pakf"))))
|
||||
(native-inputs
|
||||
(let ((conf (kernel-config (or (%current-target-system)
|
||||
(%current-system))
|
||||
|
@ -883,7 +883,7 @@ (define-public alsa-utils
|
|||
(define-public iptables
|
||||
(package
|
||||
(name "iptables")
|
||||
(version "1.4.16.2")
|
||||
(version "1.4.21")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -891,7 +891,7 @@ (define-public iptables
|
|||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vkg5lzkn4l3i1sm6v3x96zzvnv9g7mi0qgj6279ld383mzcws24"))))
|
||||
"1q6kg7sf0pgpq0qhab6sywl23cngxxfzc9zdzscsba8x09l4q02j"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no test suite
|
||||
|
@ -1307,18 +1307,15 @@ (define-public iotop
|
|||
(define-public fuse
|
||||
(package
|
||||
(name "fuse")
|
||||
(version "2.9.5")
|
||||
(version "2.9.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (let ((version-with-underscores
|
||||
(string-join (string-split version #\.) "_")))
|
||||
(string-append
|
||||
"https://github.com/libfuse/libfuse/"
|
||||
"releases/download/fuse_" version-with-underscores
|
||||
"/fuse-" version ".tar.gz")))
|
||||
(uri (string-append "https://github.com/libfuse/libfuse/releases/"
|
||||
"download/fuse-" version
|
||||
"/fuse-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dfvbi1p57svbv2sfnbqwpnsk219spvjnlapf35azhgzqlf3g7sp"))))
|
||||
"0szi2vlsjxg03y4ji51jks34p269jqj5ify6l0ajsqq6f6y8pd0c"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("util-linux" ,util-linux)))
|
||||
(arguments
|
||||
|
@ -1354,7 +1351,7 @@ (define-public fuse
|
|||
(("-DFUSERMOUNT_DIR=[[:graph:]]+")
|
||||
"-DFUSERMOUNT_DIR=\\\"/var/empty\\\"")))
|
||||
%standard-phases)))
|
||||
(home-page "http://fuse.sourceforge.net/")
|
||||
(home-page "https://github.com/libfuse/libfuse")
|
||||
(synopsis "Support file systems implemented in user space")
|
||||
(description
|
||||
"As a consequence of its monolithic design, file system code for Linux
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -23,6 +23,7 @@ (define-module (gnu packages lirc)
|
|||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages libusb)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages xorg)
|
||||
|
@ -31,23 +32,46 @@ (define-module (gnu packages lirc)
|
|||
(define-public lirc
|
||||
(package
|
||||
(name "lirc")
|
||||
(version "0.9.3")
|
||||
(version "0.9.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/lirc/lirc-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"19c6ldjsdnk1md66q3nb035ja1xj217k8iabhxpsb8rs10a6kwi6"))
|
||||
"1l2xzhnm4hrla51ik09hcafki0y8wnww7svfm7j63zbl2rssc66x"))
|
||||
(patches (search-patches "lirc-localstatedir.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--localstatedir=/var")))
|
||||
'(#:configure-flags '("--localstatedir=/var")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-lirc-make-devinput
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; 'lirc-make-devinput' script assumes that linux headers
|
||||
;; are placed in "/usr/...".
|
||||
(let ((headers (assoc-ref inputs "linux-headers")))
|
||||
(substitute* "tools/lirc-make-devinput"
|
||||
(("/usr/include") (string-append headers "/include"))))
|
||||
#t))
|
||||
(add-after 'unpack 'patch-doc/Makefile.in
|
||||
(lambda _
|
||||
;; Lirc wants to install several images and a useless html page
|
||||
;; to "$(localstatedir)/lib/lirc/". This makes 'install' phase
|
||||
;; fail as localstatedir is "/var", so do not install these
|
||||
;; files there (the same images are installed in
|
||||
;; "share/doc/lirc/images/" anyway).
|
||||
(substitute* "doc/Makefile.in"
|
||||
(("^vardocs_DATA =.*") "vardocs_DATA =\n")
|
||||
(("^varimage_DATA =.*") "varimage_DATA =\n"))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("libxslt" ,libxslt)))
|
||||
(inputs
|
||||
`(("libx11" ,libx11)
|
||||
("libusb-compat" ,libusb-compat)
|
||||
("linux-headers" ,linux-libre-headers)
|
||||
("alsa-lib" ,alsa-lib)
|
||||
("python" ,python)))
|
||||
(home-page "http://www.lirc.org/")
|
||||
|
|
|
@ -26,7 +26,7 @@ (define-module (gnu packages lisp)
|
|||
#:use-module (guix packages)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages texinfo)
|
||||
#:use-module (gnu packages texlive)
|
||||
#:use-module (gnu packages tex)
|
||||
#:use-module (gnu packages m4)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
;;; Copyright © 2014 Raimon Grau <raimonster@gmail.com>
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -30,13 +31,13 @@ (define-module (gnu packages lua)
|
|||
(define-public lua
|
||||
(package
|
||||
(name "lua")
|
||||
(version "5.2.3")
|
||||
(version "5.2.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.lua.org/ftp/lua-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk"))
|
||||
(base32 "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"))
|
||||
(patches (search-patches "lua-pkgconfig.patch"
|
||||
"lua52-liblua-so.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
|
@ -46,18 +47,18 @@ (define-public lua
|
|||
(guix build utils)
|
||||
(srfi srfi-1))
|
||||
#:test-target "test"
|
||||
#:phases (alist-replace
|
||||
'build
|
||||
(lambda _ (zero? (system* "make" "CFLAGS=-fPIC" "linux")))
|
||||
(alist-replace
|
||||
'install
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'build
|
||||
(lambda _ (zero? (system* "make" "CFLAGS=-fPIC" "linux"))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(zero? (system* "make" "install"
|
||||
(string-append "INSTALL_TOP=" out)
|
||||
(string-append "INSTALL_MAN=" out
|
||||
"/share/man/man1")))))
|
||||
(alist-delete 'configure %standard-phases)))))
|
||||
"/share/man/man1")))))))))
|
||||
(home-page "http://www.lua.org/")
|
||||
(synopsis "Embeddable scripting language")
|
||||
(description
|
||||
|
@ -78,18 +79,19 @@ (define-public lua-5.1
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16"))
|
||||
(patches (search-patches "lua51-liblua-so.patch"))))))
|
||||
(patches (search-patches "lua51-liblua-so.patch"
|
||||
"lua-CVE-2014-5461.patch"))))))
|
||||
|
||||
(define-public luajit
|
||||
(package
|
||||
(name "luajit")
|
||||
(version "2.0.3")
|
||||
(version "2.0.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://luajit.org/download/LuaJIT-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm"))
|
||||
(base32 "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2"))
|
||||
(patches (search-patches "luajit-symlinks.patch"
|
||||
"luajit-no_ldconfig.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -21,12 +22,15 @@ (define-module (gnu packages machine-learning)
|
|||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix svn-download)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system r)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages dejagnu)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages maths)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
|
@ -107,6 +111,95 @@ (define-public python-libsvm
|
|||
`(("python" ,python)))
|
||||
(synopsis "Python bindings of libSVM")))
|
||||
|
||||
(define-public ghmm
|
||||
;; The latest release candidate is several years and a couple of fixes have
|
||||
;; been published since. This is why we download the sources from the SVN
|
||||
;; repository.
|
||||
(let ((svn-revision 2341))
|
||||
(package
|
||||
(name "ghmm")
|
||||
(version (string-append "0.9-rc3-0." (number->string svn-revision)))
|
||||
(source (origin
|
||||
(method svn-fetch)
|
||||
(uri (svn-reference
|
||||
(url "http://svn.code.sf.net/p/ghmm/code/trunk")
|
||||
(revision svn-revision)))
|
||||
(file-name (string-append name "-" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0qbq1rqp94l530f043qzp8aw5lj7dng9wq0miffd7spd1ff638wq"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'enter-dir
|
||||
(lambda _ (chdir "ghmm") #t))
|
||||
(add-after 'enter-dir 'fix-PYTHONPATH
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; The Python tests fail as the library is assumed to be stored
|
||||
;; in ./build/lib.linux-i686-*. To fix this we detect the CPU
|
||||
;; and use it in the path.
|
||||
(substitute* "configure.in"
|
||||
(("AM_INIT_AUTOMAKE" line)
|
||||
(string-append line "\nAC_CANONICAL_HOST\n")))
|
||||
(substitute* "ghmmwrapper/Makefile.am"
|
||||
(("i686") "@host_cpu@"))
|
||||
#t))
|
||||
(add-after 'enter-dir 'fix-runpath
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* "ghmmwrapper/setup.py"
|
||||
(("^(.*)extra_compile_args = \\[" line indent)
|
||||
(string-append indent
|
||||
"extra_link_args = [\"-Wl,-rpath="
|
||||
(assoc-ref outputs "out") "/lib\"],\n"
|
||||
line
|
||||
"\"-Wl,-rpath="
|
||||
(assoc-ref outputs "out")
|
||||
"/lib\", ")))
|
||||
#t))
|
||||
(add-after 'enter-dir 'disable-broken-tests
|
||||
(lambda _
|
||||
(substitute* "tests/Makefile.am"
|
||||
;; GHMM_SILENT_TESTS is assumed to be a command.
|
||||
(("TESTS_ENVIRONMENT.*") "")
|
||||
;; Do not build broken tests.
|
||||
(("chmm .*") "")
|
||||
(("read_fa .*") "")
|
||||
(("mcmc .*") "")
|
||||
(("label_higher_order_test.*$")
|
||||
"label_higher_order_test\n"))
|
||||
|
||||
;; These Python unittests are broken as there is no gato.
|
||||
;; See https://sourceforge.net/p/ghmm/support-requests/3/
|
||||
(substitute* "ghmmwrapper/ghmmunittests.py"
|
||||
(("^(.*)def (testNewXML|testMultipleTransitionClasses|testNewXML)"
|
||||
line indent)
|
||||
(string-append indent
|
||||
"@unittest.skip(\"Disabled by Guix\")\n"
|
||||
line)))
|
||||
#t))
|
||||
(add-before 'configure 'autogen
|
||||
(lambda _
|
||||
(zero? (system* "bash" "./autogen.sh")))))))
|
||||
(inputs
|
||||
`(("python" ,python-2) ; only Python 2 is supported
|
||||
("libxml2" ,libxml2)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("dejagnu" ,dejagnu)
|
||||
("swig" ,swig)
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)))
|
||||
(home-page "http://ghmm.org")
|
||||
(synopsis "Hidden Markov Model library")
|
||||
(description
|
||||
"The General Hidden Markov Model library (GHMM) is a C library with
|
||||
additional Python bindings implementing a wide range of types of @dfn{Hidden
|
||||
Markov Models} (HMM) and algorithms: discrete, continous emissions, basic
|
||||
training, HMM clustering, HMM mixtures.")
|
||||
(license license:lgpl2.0+))))
|
||||
|
||||
(define-public randomjungle
|
||||
(package
|
||||
(name "randomjungle")
|
||||
|
@ -138,7 +231,8 @@ (define-public randomjungle
|
|||
("libxml2" ,libxml2)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("gfortran" ,gfortran)))
|
||||
`(("gfortran" ,gfortran)
|
||||
("gfortran:lib" ,gfortran "lib")))
|
||||
(home-page "http://www.imbs-luebeck.de/imbs/de/node/227/")
|
||||
(synopsis "Implementation of the Random Forests machine learning method")
|
||||
(description
|
||||
|
|
|
@ -344,12 +344,12 @@ (define-public mu
|
|||
("glib" ,glib "bin") ; for gtester
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("emacs" ,emacs-minimal)
|
||||
("libtool" ,libtool)
|
||||
("texinfo" ,texinfo)))
|
||||
;; TODO: Add webkit and gtk to build the mug GUI.
|
||||
(inputs
|
||||
`(("xapian" ,xapian)
|
||||
("emacs" ,emacs-no-x)
|
||||
("guile" ,guile-2.0)
|
||||
("glib" ,glib)
|
||||
("gmime" ,gmime)
|
||||
|
@ -1149,7 +1149,8 @@ (define-public procmail
|
|||
;; The following patch fixes an ambiguous definition of
|
||||
;; getline() in formail.c. The patch is provided by Debian as
|
||||
;; patch 24.
|
||||
(patches (search-patches "procmail-ambiguous-getline-debian.patch"))))
|
||||
(patches (search-patches "procmail-ambiguous-getline-debian.patch"
|
||||
"procmail-CVE-2014-3618.patch"))))
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
|
|
|
@ -81,7 +81,7 @@ (define-module (gnu packages maths)
|
|||
#:use-module (gnu packages tcsh)
|
||||
#:use-module (gnu packages tcl)
|
||||
#:use-module (gnu packages texinfo)
|
||||
#:use-module (gnu packages texlive)
|
||||
#:use-module (gnu packages tex)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages wxwidgets)
|
||||
#:use-module (gnu packages xml)
|
||||
|
@ -582,6 +582,102 @@ (define-public nlopt
|
|||
online as well as original implementations of various other algorithms.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public ipopt
|
||||
(package
|
||||
(name "ipopt")
|
||||
(version "3.12.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://www.coin-or.org/download/source/Ipopt/Ipopt-"
|
||||
version".tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"09bk2hqy2vgi4yi76xng9zxakddwqy3wij9nx7wf2vfbxxpazrsk"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Make sure we don't use the bundled software.
|
||||
'(delete-file-recursively "ThirdParty"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
(add-after 'install 'add--L-flags-in-ipopt.pc
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; The '.pc' file lists '-llapack -lblas' in "Libs";
|
||||
;; move it to "Libs.private" where it belongs, and add a
|
||||
;; '-L' flag for LAPACK.
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(lapack (assoc-ref inputs "lapack")))
|
||||
(substitute* (string-append out "/lib/pkgconfig/"
|
||||
"ipopt.pc")
|
||||
(("Libs: (.*)-llapack -lblas(.*)$" _ before after)
|
||||
(string-append "Libs: " before " " after "\n"
|
||||
"Libs.private: " before
|
||||
"-L" lapack "/lib -llapack -lblas "
|
||||
after "\n")))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("gfortran" ,gfortran)))
|
||||
(inputs
|
||||
;; TODO: Maybe add dependency on COIN-MUMPS, ASL, and HSL.
|
||||
`(("lapack" ,lapack))) ;for both libblas and liblapack
|
||||
(home-page "http://www.coin-or.org")
|
||||
(synopsis "Large-scale nonlinear optimizer")
|
||||
(description
|
||||
"The Interior Point Optimizer (IPOPT) is a software package for
|
||||
large-scale nonlinear optimization. It provides C++, C, and Fortran
|
||||
interfaces.")
|
||||
(license license:epl1.0)))
|
||||
|
||||
(define-public ceres
|
||||
(package
|
||||
(name "ceres-solver")
|
||||
(version "1.11.0")
|
||||
(home-page "http://ceres-solver.org/")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append home-page "ceres-solver-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0i7qkbf8g6pd8arxzldppga26ckv93y8zldsfz6wbd4n6b1nqrjd"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
;; TODO: Build HTML user documentation and install separately.
|
||||
;; XXX: Use the embedded "miniglog" as a replacement for
|
||||
;; <https://github.com/google/glog>. TODO: Use Glog when it's available.
|
||||
'(#:configure-flags '("-DMINIGLOG=ON"
|
||||
"-DBUILD_EXAMPLES=OFF"
|
||||
"-DBUILD_SHARED_LIBS=ON")
|
||||
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'configure 'set-library-directory
|
||||
(lambda _
|
||||
;; Install libraries to lib/, not lib64/.
|
||||
(substitute* "internal/ceres/CMakeLists.txt"
|
||||
(("set\\(LIB_SUFFIX \"64\"\\)")
|
||||
"set(LIB_SUFFIX \"\")"))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("eigen" ,eigen)
|
||||
("blas" ,openblas)
|
||||
("lapack" ,lapack)
|
||||
("suitesparse" ,suitesparse)
|
||||
("gflags" ,gflags)))
|
||||
(synopsis "C++ library for solving large optimization problems")
|
||||
(description
|
||||
"Ceres Solver is a C++ library for modeling and solving large,
|
||||
complicated optimization problems. It is a feature rich, mature and
|
||||
performant library which has been used in production since 2010. Ceres Solver
|
||||
can solve two kinds of problems:
|
||||
@enumerate
|
||||
@item non-linear least squares problems with bounds constraints;
|
||||
@item general unconstrained optimization problems.
|
||||
@end enumerate\n")
|
||||
(license license:bsd-3)))
|
||||
|
||||
;; For a fully featured Octave, users are strongly recommended also to install
|
||||
;; the following packages: texinfo, less, ghostscript, gnuplot.
|
||||
(define-public octave
|
||||
|
@ -1610,7 +1706,11 @@ (define-public wxmaxima
|
|||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("wxwidgets" ,wxwidgets)
|
||||
("maxima" ,maxima)))
|
||||
("maxima" ,maxima)
|
||||
;; Runtime support.
|
||||
("adwaita-icon-theme" ,adwaita-icon-theme)
|
||||
("gtk+" ,gtk+)
|
||||
("shared-mime-info" ,shared-mime-info)))
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
(add-after
|
||||
|
@ -1620,7 +1720,18 @@ (define-public wxmaxima
|
|||
"/bin/wxmaxima")
|
||||
`("PATH" ":" prefix
|
||||
(,(string-append (assoc-ref inputs "maxima")
|
||||
"/bin"))))
|
||||
"/bin")))
|
||||
;; For GtkFileChooserDialog.
|
||||
`("GSETTINGS_SCHEMA_DIR" =
|
||||
(,(string-append (assoc-ref inputs "gtk+")
|
||||
"/share/glib-2.0/schemas")))
|
||||
`("XDG_DATA_DIRS" ":" prefix
|
||||
(;; Needed by gdk-pixbuf to know supported icon formats.
|
||||
,(string-append
|
||||
(assoc-ref inputs "shared-mime-info") "/share")
|
||||
;; The default icon theme of GTK+.
|
||||
,(string-append
|
||||
(assoc-ref inputs "adwaita-icon-theme") "/share"))))
|
||||
#t)))))
|
||||
(home-page "https://andrejv.github.io/wxmaxima/")
|
||||
(synopsis "Graphical user interface for the Maxima computer algebra system")
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -36,7 +37,11 @@ (define-public mcrypt
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"161031n1w9pb4yzz9i47szc12a4mwpcpvyxnvafsik2l9s2aliai"))))
|
||||
"161031n1w9pb4yzz9i47szc12a4mwpcpvyxnvafsik2l9s2aliai"))
|
||||
(patches (search-patches
|
||||
"mcrypt-CVE-2012-4409.patch"
|
||||
"mcrypt-CVE-2012-4426.patch"
|
||||
"mcrypt-CVE-2012-4527.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("zlib" ,zlib)
|
||||
|
|
|
@ -378,14 +378,14 @@ (define-public pidgin-otr
|
|||
(define-public znc
|
||||
(package
|
||||
(name "znc")
|
||||
(version "1.6.2")
|
||||
(version "1.6.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://znc.in/releases/archive/znc-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"14q5dyr5zg99hm6j6g1gilcn1zf7dskhxfpz3bnkyhy6q0kpgwgf"))))
|
||||
"09xqi5fs40x6nj9gq99bnw1a7saq96bvqxknxx0ilq7yfvg4c733"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; tries to download GoogleTest with wget
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -28,7 +29,7 @@ (define-module (gnu packages moreutils)
|
|||
(define-public moreutils
|
||||
(package
|
||||
(name "moreutils")
|
||||
(version "0.57")
|
||||
(version "0.58")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -36,7 +37,7 @@ (define-public moreutils
|
|||
version ".orig.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"078dpkwwwrv8hxnylbc901kib2d1rr3hsja37j6dlpjfcfq58z9s"))))
|
||||
"02n00vqp6jxbxr5v3rdjxmzp6kxxjdkjgcclam6wrw8qamsbljww"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("perl" ,perl)
|
||||
("libxml2" ,libxml2)
|
||||
|
@ -45,8 +46,8 @@ (define-public moreutils
|
|||
("docbook-xsl" ,docbook-xsl)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(alist-replace
|
||||
'configure
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(use-modules (srfi srfi-1))
|
||||
(substitute* "Makefile"
|
||||
|
@ -55,8 +56,7 @@ (define-public moreutils
|
|||
(files (find-files docbook-xsl "^docbook\\.xsl$")))
|
||||
(find (lambda (file)
|
||||
(string-suffix? "/manpages/docbook.xsl" file))
|
||||
files)))))
|
||||
%standard-phases)
|
||||
files)))))))
|
||||
#:make-flags
|
||||
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
|
||||
"CC=gcc")))
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -107,11 +108,11 @@ (define-public id3lib
|
|||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/id3lib/id3lib/"
|
||||
version "/id3lib-"
|
||||
version ".tar.gz"))
|
||||
version "/id3lib-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97"))))
|
||||
"0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97"))
|
||||
(patches (search-patches "id3lib-CVE-2007-4460.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -417,36 +418,36 @@ (define-public mpc123
|
|||
(version "0.2.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/mpc123/version%20"
|
||||
version "/mpc123-" version ".tar.gz"))
|
||||
(uri (list (string-append "mirror://sourceforge/mpc123/version%20"
|
||||
version "/mpc123-" version ".tar.gz")
|
||||
(string-append "mirror://debian/pool/main/m/" name
|
||||
"/" name "_" version ".orig.tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0sf4pns0245009z6mbxpx7kqy4kwl69bc95wz9v23wgappsvxgy1"))
|
||||
(patches (search-patches "mpc123-initialize-ao.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (alist-replace
|
||||
'configure
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
(("CC[[:blank:]]*:=.*")
|
||||
"CC := gcc\n")))
|
||||
(alist-replace
|
||||
'install
|
||||
"CC := gcc\n"))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin")))
|
||||
(mkdir-p bin)
|
||||
(install-file "mpc123" bin)))
|
||||
%standard-phases))
|
||||
(install-file "mpc123" bin)))))
|
||||
#:tests? #f))
|
||||
|
||||
(native-inputs
|
||||
`(("gettext" ,gnu-gettext)))
|
||||
(inputs
|
||||
`(("libao" ,ao)
|
||||
("libmpcdec" ,libmpcdec)))
|
||||
(home-page "http://mpc123.sourceforge.net/")
|
||||
(home-page "https://github.com/bucciarati/mpc123")
|
||||
(synopsis "Audio player for Musepack-formatted files")
|
||||
(description
|
||||
"Mpc123 is a command-line player for files in the Musepack audio
|
||||
|
@ -456,7 +457,7 @@ (define-public mpc123
|
|||
(define-public eyed3
|
||||
(package
|
||||
(name "eyed3")
|
||||
(version "0.7.8")
|
||||
(version "0.7.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -464,7 +465,7 @@ (define-public eyed3
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1nv7nhfn1d0qm7rgkzksbccgqisng8klf97np0nwaqwd5dbmdf86"))))
|
||||
"08mzhqg3k63d244cgwd0y1xrb8x9m6b99ykyskpnwyxl4wxrgrzp"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:python ,python-2))
|
||||
|
|
|
@ -85,7 +85,7 @@ (define-module (gnu packages music)
|
|||
#:use-module (gnu packages sdl)
|
||||
#:use-module (gnu packages tcl)
|
||||
#:use-module (gnu packages texinfo)
|
||||
#:use-module (gnu packages texlive)
|
||||
#:use-module (gnu packages tex)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages web)
|
||||
|
@ -437,10 +437,10 @@ (define-public lilypond
|
|||
(define-public non-sequencer
|
||||
;; The latest tagged release is three years old and uses a custom build
|
||||
;; system, so we take the last commit affecting the "sequencer" directory.
|
||||
(let ((commit "1d9bd576"))
|
||||
(let ((commit "1d9bd576f6bf7ea240af5f7a60260592750af0dd"))
|
||||
(package
|
||||
(name "non-sequencer")
|
||||
(version (string-append "1.9.5-" commit))
|
||||
(version (string-append "1.9.5-" (string-take commit 7)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
;;; Copyright © 2016 Raimon Grau <raimonster@gmail.com>
|
||||
;;; Copyright © 2016 Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
|
||||
;;; Copyright 2016 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -26,12 +27,25 @@ (define-module (gnu packages networking)
|
|||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages adns)
|
||||
#:use-module (gnu packages audio)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages mit-krb5)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages compression))
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages tls))
|
||||
|
||||
(define-public macchanger
|
||||
(package
|
||||
|
@ -115,14 +129,14 @@ (define-public socat
|
|||
(define-public zeromq
|
||||
(package
|
||||
(name "zeromq")
|
||||
(version "4.0.5")
|
||||
(version "4.0.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.zeromq.org/zeromq-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0arl8fy8d03xd5h0mgda1s5bajwg8iyh1kk4hd1420rpcxgkrj9v"))))
|
||||
"00vvwhgcdr1lva2pavicvy92iad0hj8cf71n702hv6blw1kjj2z0"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://zeromq.org")
|
||||
(synopsis "Library for message-based applications")
|
||||
|
@ -273,3 +287,54 @@ (define-public iodine
|
|||
and up to 1 Mbit/s downstream.")
|
||||
;; src/md5.[ch] is released under the zlib license
|
||||
(license (list license:isc license:zlib))))
|
||||
|
||||
(define-public wireshark
|
||||
(package
|
||||
(name "wireshark")
|
||||
(version "2.0.3")
|
||||
(synopsis "Network traffic analyzer")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.wireshark.org/download/src/wireshark-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1z358k65frp9m0l07cppwxhvbcp1w9ya5sml87pzs8gyfmp3g5p1"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(inputs `(("bison" ,bison)
|
||||
("c-ares" ,c-ares)
|
||||
("flex" ,flex)
|
||||
("gnutls" ,gnutls)
|
||||
("gtk+" ,gtk+)
|
||||
("libcap" ,libcap)
|
||||
("libgcrypt" ,libgcrypt)
|
||||
("libnl" ,libnl)
|
||||
("libpcap" ,libpcap)
|
||||
("lua" ,lua)
|
||||
("krb5" ,mit-krb5)
|
||||
("openssl" ,openssl)
|
||||
("portaudio" ,portaudio)
|
||||
("sbc" ,sbc)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs `(("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-wrapper)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list (string-append "--with-c-ares=" (assoc-ref %build-inputs "c-ares"))
|
||||
(string-append "--with-krb5=" (assoc-ref %build-inputs "krb5"))
|
||||
(string-append "--with-libcap=" (assoc-ref %build-inputs "libcap"))
|
||||
(string-append "--with-lua=" (assoc-ref %build-inputs "lua"))
|
||||
(string-append "--with-pcap=" (assoc-ref %build-inputs "libpcap"))
|
||||
(string-append "--with-portaudio="
|
||||
(assoc-ref %build-inputs "portaudio"))
|
||||
(string-append "--with-sbc=" (assoc-ref %build-inputs "sbc"))
|
||||
(string-append "--with-ssl=" (assoc-ref %build-inputs "openssl"))
|
||||
(string-append "--with-zlib=" (assoc-ref %build-inputs "zlib"))
|
||||
"--without-qt")))
|
||||
(description "Wireshark is a network protocol analyzer, or @dfn{packet
|
||||
sniffer}, that lets you capture and interactively browse the contents of
|
||||
network frames.")
|
||||
(license license:gpl2+)
|
||||
(home-page "https://www.wireshark.org/")))
|
||||
|
|
|
@ -39,16 +39,20 @@ (define-module (gnu packages ntp)
|
|||
(define-public ntp
|
||||
(package
|
||||
(name "ntp")
|
||||
(version "4.2.8p7")
|
||||
(version "4.2.8p8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
(uri (list (string-append
|
||||
"http://archive.ntp.org/ntp4/ntp-"
|
||||
(version-major+minor version)
|
||||
"/ntp-" version ".tar.gz"))
|
||||
"/ntp-" version ".tar.gz")
|
||||
(string-append
|
||||
"https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-"
|
||||
(version-major+minor version)
|
||||
"/ntp-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"1p100856h17nb0kpnppy70nja57hbcc95h7shhxvw6mhl030rll1"))
|
||||
"1vlpgd0dk2wkpmmf869sfxi8f46sfnmjgk51vl8n6vj5y2sx1cra"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
|
@ -38,7 +38,7 @@ (define-module (gnu packages ocaml)
|
|||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (gnu packages texlive)
|
||||
#:use-module (gnu packages tex)
|
||||
#:use-module (gnu packages ghostscript)
|
||||
#:use-module (gnu packages lynx)
|
||||
#:use-module (gnu packages perl)
|
||||
|
@ -386,7 +386,7 @@ (define-public proof-general
|
|||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("which" ,which)
|
||||
("emacs" ,emacs-no-x)
|
||||
("emacs" ,emacs-minimal)
|
||||
("texinfo" ,texinfo)))
|
||||
(inputs
|
||||
`(("host-emacs" ,emacs)
|
||||
|
|
|
@ -152,7 +152,7 @@ (define (copy arch)
|
|||
|
||||
#t))))))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)
|
||||
("emacs" ,emacs-no-x))) ;for guix.el
|
||||
("emacs" ,emacs-minimal))) ;for guix.el
|
||||
(inputs
|
||||
(let ((boot-guile (lambda (arch hash)
|
||||
(origin
|
||||
|
@ -327,14 +327,15 @@ (define-public stow
|
|||
(define-public rpm
|
||||
(package
|
||||
(name "rpm")
|
||||
(version "4.12.0")
|
||||
(version "4.12.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://rpm.org/releases/rpm-4.12.x/rpm-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"18hk47hc755nslvb7xkq4jb095z7va0nlcyxdpxayc4lmb8mq3bp"))))
|
||||
"0a82ym8phx7g0f3k6smvxnvzh7yv857l42xafk49689kzhld5pbp"))
|
||||
(patches (search-patches "rpm-CVE-2014-8118.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--with-external-db" ;use the system's bdb
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
|
||||
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -28,6 +29,7 @@ (define-module (gnu packages parallel)
|
|||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages freeipmi)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages mpi)
|
||||
|
@ -121,3 +123,30 @@ (define-public slurm
|
|||
job) on a set of allocated nodes, and arbitrates contention for resources
|
||||
by managing a queue of pending work.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public slurm-drmaa
|
||||
(package
|
||||
(name "slurm-drmaa")
|
||||
(version "1.0.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri "http://apps.man.poznan.pl/trac/slurm-drmaa/downloads/9")
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0grw55hmny2mc4nc0y1arnvxd2k0dcdfn476kzs180fibjxgfw14"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("slurm" ,slurm)))
|
||||
(native-inputs
|
||||
`(("which" ,which)))
|
||||
(home-page "http://apps.man.poznan.pl/trac/slurm-drmaa")
|
||||
(synopsis "Distributed resource management application API for SLURM")
|
||||
(description
|
||||
"PSNC DRMAA for Simple Linux Utility for Resource Management (SLURM) is
|
||||
an implementation of Open Grid Forum DRMAA 1.0 (Distributed Resource
|
||||
Management Application API) specification for submission and control of jobs
|
||||
to SLURM. Using DRMAA, grid applications builders, portal developers and ISVs
|
||||
can use the same high-level API to link their software with different
|
||||
cluster/resource management systems.")
|
||||
(license license:gpl3+)))
|
||||
|
|
69
gnu/packages/patches/a2ps-CVE-2001-1593.patch
Normal file
69
gnu/packages/patches/a2ps-CVE-2001-1593.patch
Normal file
|
@ -0,0 +1,69 @@
|
|||
Index: b/lib/routines.c
|
||||
===================================================================
|
||||
--- a/lib/routines.c
|
||||
+++ b/lib/routines.c
|
||||
@@ -242,3 +242,50 @@
|
||||
/* Don't complain if you can't unlink. Who cares of a tmp file? */
|
||||
unlink (filename);
|
||||
}
|
||||
+
|
||||
+/*
|
||||
+ * Securely generate a temp file, and make sure it gets
|
||||
+ * deleted upon exit.
|
||||
+ */
|
||||
+static char ** tempfiles;
|
||||
+static unsigned ntempfiles;
|
||||
+
|
||||
+static void
|
||||
+cleanup_tempfiles()
|
||||
+{
|
||||
+ while (ntempfiles--)
|
||||
+ unlink(tempfiles[ntempfiles]);
|
||||
+}
|
||||
+
|
||||
+char *
|
||||
+safe_tempnam(const char *pfx)
|
||||
+{
|
||||
+ char *dirname, *filename;
|
||||
+ int fd;
|
||||
+
|
||||
+ if (!(dirname = getenv("TMPDIR")))
|
||||
+ dirname = "/tmp";
|
||||
+
|
||||
+ tempfiles = (char **) realloc(tempfiles,
|
||||
+ (ntempfiles+1) * sizeof(char *));
|
||||
+ if (tempfiles == NULL)
|
||||
+ return NULL;
|
||||
+
|
||||
+ filename = malloc(strlen(dirname) + strlen(pfx) + sizeof("/XXXXXX"));
|
||||
+ if (!filename)
|
||||
+ return NULL;
|
||||
+
|
||||
+ sprintf(filename, "%s/%sXXXXXX", dirname, pfx);
|
||||
+
|
||||
+ if ((fd = mkstemp(filename)) < 0) {
|
||||
+ free(filename);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ close(fd);
|
||||
+
|
||||
+ if (ntempfiles == 0)
|
||||
+ atexit(cleanup_tempfiles);
|
||||
+ tempfiles[ntempfiles++] = filename;
|
||||
+
|
||||
+ return filename;
|
||||
+}
|
||||
Index: b/lib/routines.h
|
||||
===================================================================
|
||||
--- a/lib/routines.h
|
||||
+++ b/lib/routines.h
|
||||
@@ -255,7 +255,8 @@
|
||||
/* If _STR_ is not defined, give it a tempname in _TMPDIR_ */
|
||||
#define tempname_ensure(Str) \
|
||||
do { \
|
||||
- (Str) = (Str) ? (Str) : tempnam (NULL, "a2_"); \
|
||||
+ (Str) = (Str) ? (Str) : safe_tempnam("a2_"); \
|
||||
} while (0)
|
||||
+char * safe_tempnam(const char *);
|
||||
|
||||
#endif
|
30
gnu/packages/patches/a2ps-CVE-2014-0466.patch
Normal file
30
gnu/packages/patches/a2ps-CVE-2014-0466.patch
Normal file
|
@ -0,0 +1,30 @@
|
|||
Description: CVE-2014-0466: fixps does not invoke gs with -dSAFER
|
||||
A malicious PostScript file could delete files with the privileges of
|
||||
the invoking user.
|
||||
Origin: vendor
|
||||
Bug-Debian: http://bugs.debian.org/742902
|
||||
Author: Salvatore Bonaccorso <carnil@debian.org>
|
||||
Last-Update: 2014-03-28
|
||||
|
||||
--- a/contrib/fixps.in
|
||||
+++ b/contrib/fixps.in
|
||||
@@ -389,7 +389,7 @@
|
||||
eval "$command" ;;
|
||||
gs)
|
||||
$verbose "$program: making a full rewrite of the file ($gs)." >&2
|
||||
- $gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
|
||||
+ $gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
|
||||
esac
|
||||
)
|
||||
fi
|
||||
--- a/contrib/fixps.m4
|
||||
+++ b/contrib/fixps.m4
|
||||
@@ -307,7 +307,7 @@
|
||||
eval "$command" ;;
|
||||
gs)
|
||||
$verbose "$program: making a full rewrite of the file ($gs)." >&2
|
||||
- $gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
|
||||
+ $gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
|
||||
esac
|
||||
)
|
||||
fi
|
21
gnu/packages/patches/antiword-CVE-2014-8123.patch
Normal file
21
gnu/packages/patches/antiword-CVE-2014-8123.patch
Normal file
|
@ -0,0 +1,21 @@
|
|||
Description: Add check for buffer overflow with malformed input files
|
||||
This was later re-found and became CVE-2014-8123.
|
||||
Author: <eriks@debian.org>
|
||||
Bug-Debian: http://bugs.debian.org/407015
|
||||
Bug-Debian: https://bugs.debian.org/771768
|
||||
Forwarded: http://seclists.org/oss-sec/2014/q4/870
|
||||
Last-Update: 2016-01-11
|
||||
|
||||
--- antiword-0.37~/wordole.c 2005-08-26 21:49:57.000000000 +0200
|
||||
+++ antiword-0.37/wordole.c 2009-06-03 22:31:15.948014682 +0200
|
||||
@@ -259,6 +259,10 @@
|
||||
}
|
||||
tNameSize = (size_t)usGetWord(0x40, aucBytes);
|
||||
tNameSize = (tNameSize + 1) / 2;
|
||||
+ if ( tNameSize > sizeof(atPPSlist[iIndex].szName)) {
|
||||
+ werr(0, "Name Size of PPS %d is too large", iIndex);
|
||||
+ tNameSize = sizeof(atPPSlist[iIndex].szName);
|
||||
+ }
|
||||
vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize);
|
||||
atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes);
|
||||
if (atPPSlist[iIndex].ucType == 5) {
|
24
gnu/packages/patches/devil-CVE-2009-3994.patch
Normal file
24
gnu/packages/patches/devil-CVE-2009-3994.patch
Normal file
|
@ -0,0 +1,24 @@
|
|||
Fix CVE-2009-3994 (buffer overflow in GetUID() allows remote DOS or
|
||||
arbitrary code execution via crafted DICOM file).
|
||||
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3994
|
||||
|
||||
Copied from Fedora
|
||||
https://pkgs.fedoraproject.org/cgit/rpms/DevIL.git/tree/DevIL-1.7.8-CVE-2009-3994.patch?id=9c656a75393d6c455aef9f4968fbbee9c53f4fdb
|
||||
|
||||
diff -up devil-1.7.8/src-IL/src/il_dicom.c~ devil-1.7.8/src-IL/src/il_dicom.c
|
||||
--- devil-1.7.8/src-IL/src/il_dicom.c~ 2009-03-08 08:10:09.000000000 +0100
|
||||
+++ devil-1.7.8/src-IL/src/il_dicom.c 2009-12-03 12:07:45.000000000 +0100
|
||||
@@ -427,9 +427,11 @@ ILboolean GetUID(ILubyte *UID)
|
||||
return IL_FALSE;
|
||||
|
||||
ValLen = GetLittleUShort();
|
||||
+ if (ValLen > 64)
|
||||
+ return IL_FALSE;
|
||||
if (iread(UID, ValLen, 1) != 1)
|
||||
return IL_FALSE;
|
||||
- UID[64] = 0; // Just to make sure that our string is terminated.
|
||||
+ UID[ValLen] = 0; // Just to make sure that our string is terminated.
|
||||
|
||||
return IL_TRUE;
|
||||
}
|
29
gnu/packages/patches/emacs-fix-scheme-indent-function.patch
Normal file
29
gnu/packages/patches/emacs-fix-scheme-indent-function.patch
Normal file
|
@ -0,0 +1,29 @@
|
|||
Fix 'scheme-indent-function' to indent s-expressions starting with a keyword
|
||||
properly, like this:
|
||||
|
||||
(#:foo 1
|
||||
#:bar 2)
|
||||
|
||||
instead of like this:
|
||||
|
||||
(#:foo 1
|
||||
#:bar 2)
|
||||
|
||||
The fix is made by Mark H Weaver <mhw@netris.org>:
|
||||
<http://www.netris.org/~mhw/scheme-indent-function.el>
|
||||
|
||||
--- a/lisp/progmodes/scheme.el
|
||||
+++ b/lisp/progmodes/scheme.el
|
||||
@@ -482,6 +482,12 @@
|
||||
(> (length function) 3)
|
||||
(string-match "\\`def" function)))
|
||||
(lisp-indent-defform state indent-point))
|
||||
+ ((and (null method)
|
||||
+ (> (length function) 1)
|
||||
+ ;; The '#' in '#:' seems to get lost, not sure why
|
||||
+ (string-match "\\`:" function))
|
||||
+ (let ((lisp-body-indent 1))
|
||||
+ (lisp-indent-defform state indent-point)))
|
||||
((integerp method)
|
||||
(lisp-indent-specform method state
|
||||
indent-point normal-indent))
|
|
@ -1,36 +0,0 @@
|
|||
Adapted from upstream commit 2bb97f407c1145c850416a3bfbcc8cf124e68a19
|
||||
(gd2: handle corrupt images better (CVE-2016-3074)).
|
||||
|
||||
This patch omits the upstream changes to '.gitignore', and the test
|
||||
added in files 'tests/Makefile.am', 'tests/gd2/gd2_read_corrupt.c', and
|
||||
'tests/gd2/invalid_neg_size.gd2'.
|
||||
|
||||
We omit the test because its input data,
|
||||
'tests/gd2/invalid_neg_size.gd2', is provided as a binary Git diff,
|
||||
which is not supported by `patch`.
|
||||
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-3074
|
||||
https://github.com/libgd/libgd/commit/2bb97f407c1145c850416a3bfbcc8cf124e68a19
|
||||
---
|
||||
.gitignore | 1 +
|
||||
src/gd_gd2.c | 2 ++
|
||||
tests/Makefile.am | 3 ++-
|
||||
tests/gd2/gd2_read_corrupt.c | 25 +++++++++++++++++++++++++
|
||||
tests/gd2/invalid_neg_size.gd2 | Bin 0 -> 1676 bytes
|
||||
5 files changed, 30 insertions(+), 1 deletion(-)
|
||||
create mode 100644 tests/gd2/gd2_read_corrupt.c
|
||||
create mode 100644 tests/gd2/invalid_neg_size.gd2
|
||||
|
||||
diff --git a/src/gd_gd2.c b/src/gd_gd2.c
|
||||
index 6f28461..a50b33d 100644
|
||||
--- a/src/gd_gd2.c
|
||||
+++ b/src/gd_gd2.c
|
||||
@@ -165,6 +165,8 @@ _gd2GetHeader (gdIOCtxPtr in, int *sx, int *sy,
|
||||
if (gdGetInt (&cidx[i].size, in) != 1) {
|
||||
goto fail2;
|
||||
};
|
||||
+ if (cidx[i].offset < 0 || cidx[i].size < 0)
|
||||
+ goto fail2;
|
||||
};
|
||||
*chunkIdx = cidx;
|
||||
};
|
117
gnu/packages/patches/gegl-CVE-2012-4433.patch
Normal file
117
gnu/packages/patches/gegl-CVE-2012-4433.patch
Normal file
|
@ -0,0 +1,117 @@
|
|||
From: Michael Gilbert <mgilbert@debian.org>
|
||||
Date: Mon, 9 Sep 2013 17:34:32 +0200
|
||||
Subject: Fix_CVE-2012-4433
|
||||
|
||||
Multiple buffer overflow issues.
|
||||
|
||||
Closes: #692435
|
||||
---
|
||||
operations/external/ppm-load.c | 62 ++++++++++++++++++++++++++++++++++++------
|
||||
1 file changed, 53 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/operations/external/ppm-load.c b/operations/external/ppm-load.c
|
||||
index efe6d56..465096d 100644
|
||||
--- a/operations/external/ppm-load.c
|
||||
+++ b/operations/external/ppm-load.c
|
||||
@@ -36,6 +36,7 @@ gegl_chant_file_path (path, _("File"), "", _("Path of file to load."))
|
||||
#include "gegl-chant.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <errno.h>
|
||||
|
||||
typedef enum {
|
||||
PIXMAP_ASCII = 51,
|
||||
@@ -44,8 +45,8 @@ typedef enum {
|
||||
|
||||
typedef struct {
|
||||
map_type type;
|
||||
- gint width;
|
||||
- gint height;
|
||||
+ glong width;
|
||||
+ glong height;
|
||||
gsize numsamples; /* width * height * channels */
|
||||
gsize bpc; /* bytes per channel */
|
||||
guchar *data;
|
||||
@@ -82,12 +83,33 @@ ppm_load_read_header(FILE *fp,
|
||||
}
|
||||
|
||||
/* Get Width and Height */
|
||||
- img->width = strtol (header,&ptr,0);
|
||||
- img->height = atoi (ptr);
|
||||
- img->numsamples = img->width * img->height * CHANNEL_COUNT;
|
||||
+ errno = 0;
|
||||
+ img->width = strtol (header,&ptr,10);
|
||||
+ if (errno)
|
||||
+ {
|
||||
+ g_warning ("Error reading width: %s", strerror(errno));
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+ else if (img->width < 0)
|
||||
+ {
|
||||
+ g_warning ("Error: width is negative");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ img->height = strtol (ptr,&ptr,10);
|
||||
+ if (errno)
|
||||
+ {
|
||||
+ g_warning ("Error reading height: %s", strerror(errno));
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+ else if (img->width < 0)
|
||||
+ {
|
||||
+ g_warning ("Error: height is negative");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
|
||||
fgets (header,MAX_CHARS_IN_ROW,fp);
|
||||
- maxval = strtol (header,&ptr,0);
|
||||
+ maxval = strtol (header,&ptr,10);
|
||||
|
||||
if ((maxval != 255) && (maxval != 65535))
|
||||
{
|
||||
@@ -109,6 +131,16 @@ ppm_load_read_header(FILE *fp,
|
||||
g_warning ("%s: Programmer stupidity error", G_STRLOC);
|
||||
}
|
||||
|
||||
+ /* Later on, img->numsamples is multiplied with img->bpc to allocate
|
||||
+ * memory. Ensure it doesn't overflow. */
|
||||
+ if (!img->width || !img->height ||
|
||||
+ G_MAXSIZE / img->width / img->height / CHANNEL_COUNT < img->bpc)
|
||||
+ {
|
||||
+ g_warning ("Illegal width/height: %ld/%ld", img->width, img->height);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+ img->numsamples = img->width * img->height * CHANNEL_COUNT;
|
||||
+
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -229,12 +261,24 @@ process (GeglOperation *operation,
|
||||
if (!ppm_load_read_header (fp, &img))
|
||||
goto out;
|
||||
|
||||
- rect.height = img.height;
|
||||
- rect.width = img.width;
|
||||
-
|
||||
/* Allocating Array Size */
|
||||
+
|
||||
+ /* Should use g_try_malloc(), but this causes crashes elsewhere because the
|
||||
+ * error signalled by returning FALSE isn't properly acted upon. Therefore
|
||||
+ * g_malloc() is used here which aborts if the requested memory size can't be
|
||||
+ * allocated causing a controlled crash. */
|
||||
img.data = (guchar*) g_malloc (img.numsamples * img.bpc);
|
||||
|
||||
+ /* No-op without g_try_malloc(), see above. */
|
||||
+ if (! img.data)
|
||||
+ {
|
||||
+ g_warning ("Couldn't allocate %" G_GSIZE_FORMAT " bytes, giving up.", ((gsize)img.numsamples * img.bpc));
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ rect.height = img.height;
|
||||
+ rect.width = img.width;
|
||||
+
|
||||
switch (img.bpc)
|
||||
{
|
||||
case 1:
|
291
gnu/packages/patches/icedtea-remove-overrides.patch
Normal file
291
gnu/packages/patches/icedtea-remove-overrides.patch
Normal file
|
@ -0,0 +1,291 @@
|
|||
Upstream patch:
|
||||
http://icedtea.classpath.org/hg/icedtea6/rev/60be25a84f2d
|
||||
|
||||
Fixes build failure:
|
||||
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2954
|
||||
|
||||
Changes to the files 'NEWS' and 'ChangeLog' are omitted here.
|
||||
|
||||
# HG changeset patch
|
||||
# User Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
# Date 1463144538 -3600
|
||||
# Node ID 60be25a84f2dd2bce8ff277cc3854cca1b3f7931
|
||||
# Parent c23ceebb80a19a33316f1e743eb93bdf79aac220
|
||||
PR2954: ecj/override.patch is missing new @Overrides in RMIJRMPServerImpl.java
|
||||
|
||||
2016-05-13 Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
|
||||
PR2954: ecj/override.patch is missing new
|
||||
@Overrides in RMIJRMPServerImpl.java
|
||||
* patches/ecj/override.patch:
|
||||
Add cases in RMIJRMPServerImpl and others
|
||||
which show up when source/target 5 is
|
||||
used in the rt-class-files pre-build.
|
||||
* patches/openjdk/8014205-blank_swing_dialogs_windows.patch:
|
||||
Remove addition of @Override.
|
||||
|
||||
diff -r c23ceebb80a1 -r 60be25a84f2d patches/ecj/override.patch
|
||||
--- a/patches/ecj/override.patch Sun May 08 21:28:21 2016 +0100
|
||||
+++ b/patches/ecj/override.patch Fri May 13 14:02:18 2016 +0100
|
||||
@@ -362,3 +362,240 @@
|
||||
public Class<?> run() {
|
||||
try {
|
||||
ReflectUtil.checkPackageAccess(className);
|
||||
+diff -r 545db1dd8c2a src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java
|
||||
+--- openjdk-ecj/jdk/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java Wed May 04 23:23:55 2016 +0100
|
||||
++++ openjdk-ecj/jdk/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java Thu May 12 01:30:54 2016 +0100
|
||||
+@@ -1870,7 +1870,6 @@
|
||||
+
|
||||
+ private ModifiableClassLoaderRepository getInstantiatorCLR() {
|
||||
+ return AccessController.doPrivileged(new PrivilegedAction<ModifiableClassLoaderRepository>() {
|
||||
+- @Override
|
||||
+ public ModifiableClassLoaderRepository run() {
|
||||
+ return instantiator != null ? instantiator.getClassLoaderRepository() : null;
|
||||
+ }
|
||||
+diff -r 545db1dd8c2a src/share/classes/com/sun/media/sound/Platform.java
|
||||
+--- openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/Platform.java Wed May 04 23:23:55 2016 +0100
|
||||
++++ openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/Platform.java Thu May 12 01:30:54 2016 +0100
|
||||
+@@ -160,7 +160,6 @@
|
||||
+ try {
|
||||
+ // load the main library
|
||||
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
|
||||
+- @Override
|
||||
+ public Void run() {
|
||||
+ System.loadLibrary(libNameMain);
|
||||
+ return null;
|
||||
+@@ -182,7 +181,6 @@
|
||||
+ final String lib = st.nextToken();
|
||||
+ try {
|
||||
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
|
||||
+- @Override
|
||||
+ public Void run() {
|
||||
+ System.loadLibrary(lib);
|
||||
+ return null;
|
||||
+diff -r 545db1dd8c2a src/share/classes/java/awt/EventQueue.java
|
||||
+--- openjdk-ecj/jdk/src/share/classes/java/awt/EventQueue.java Wed May 04 23:23:55 2016 +0100
|
||||
++++ openjdk-ecj/jdk/src/share/classes/java/awt/EventQueue.java Thu May 12 01:30:54 2016 +0100
|
||||
+@@ -190,7 +190,6 @@
|
||||
+ EventQueue.invokeAndWait(source, r);
|
||||
+ }
|
||||
+
|
||||
+- @Override
|
||||
+ public long getMostRecentEventTime(EventQueue eventQueue) {
|
||||
+ return eventQueue.getMostRecentEventTimeImpl();
|
||||
+ }
|
||||
+diff -r 545db1dd8c2a src/share/classes/java/io/ObjectInputStream.java
|
||||
+--- openjdk-ecj/jdk/src/share/classes/java/io/ObjectInputStream.java Wed May 04 23:23:55 2016 +0100
|
||||
++++ openjdk-ecj/jdk/src/share/classes/java/io/ObjectInputStream.java Thu May 12 01:30:54 2016 +0100
|
||||
+@@ -3571,7 +3571,6 @@
|
||||
+ }
|
||||
+ static {
|
||||
+ SharedSecrets.setJavaObjectInputStreamAccess(new JavaObjectInputStreamAccess() {
|
||||
+- @Override
|
||||
+ public void setValidator(ObjectInputStream ois, ObjectStreamClassValidator validator) {
|
||||
+ ObjectInputStream.setValidator(ois, validator);
|
||||
+ }
|
||||
+diff -r 545db1dd8c2a src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java
|
||||
+--- openjdk-ecj/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java Wed May 04 23:23:55 2016 +0100
|
||||
++++ openjdk-ecj/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java Thu May 12 01:30:54 2016 +0100
|
||||
+@@ -64,7 +64,6 @@
|
||||
+ final String propName = "sun.rmi.server.invocationhandler.allowFinalizeInvocation";
|
||||
+ String allowProp = java.security.AccessController.doPrivileged(
|
||||
+ new PrivilegedAction<String>() {
|
||||
+- @Override
|
||||
+ public String run() {
|
||||
+ return System.getProperty(propName);
|
||||
+ }
|
||||
+diff -r 545db1dd8c2a src/share/classes/sun/awt/image/SunVolatileImage.java
|
||||
+--- openjdk-ecj/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java Wed May 04 23:23:55 2016 +0100
|
||||
++++ openjdk-ecj/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java Thu May 12 01:30:54 2016 +0100
|
||||
+@@ -262,7 +262,6 @@
|
||||
+ *
|
||||
+ * @see sun.java2d.DestSurfaceProvider#getDestSurface
|
||||
+ */
|
||||
+- @Override
|
||||
+ public Surface getDestSurface() {
|
||||
+ return volSurfaceManager.getPrimarySurfaceData();
|
||||
+ }
|
||||
+diff -r 545db1dd8c2a src/share/classes/sun/java2d/SunGraphics2D.java
|
||||
+--- openjdk-ecj/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Wed May 04 23:23:55 2016 +0100
|
||||
++++ openjdk-ecj/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Thu May 12 01:30:54 2016 +0100
|
||||
+@@ -3294,7 +3294,6 @@
|
||||
+ *
|
||||
+ * @see sun.java2d.DestSurfaceProvider#getDestSurface
|
||||
+ */
|
||||
+- @Override
|
||||
+ public Surface getDestSurface() {
|
||||
+ return surfaceData;
|
||||
+ }
|
||||
+diff -r 545db1dd8c2a src/share/classes/sun/rmi/server/UnicastServerRef.java
|
||||
+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java Wed May 04 23:23:55 2016 +0100
|
||||
++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java Thu May 12 01:30:54 2016 +0100
|
||||
+@@ -630,12 +630,10 @@
|
||||
+ this.callID = callID;
|
||||
+ }
|
||||
+
|
||||
+- @Override
|
||||
+ public void validateDescriptor(ObjectStreamClass descriptor) {
|
||||
+ descriptorCheck.check(method, descriptor, parameterIndex, callID);
|
||||
+ }
|
||||
+
|
||||
+- @Override
|
||||
+ public void checkProxyInterfaceNames(String[] ifaces) {
|
||||
+ descriptorCheck.checkProxyClass(method, ifaces, parameterIndex, callID);
|
||||
+ }
|
||||
+diff -r 545db1dd8c2a src/share/classes/sun/rmi/transport/Transport.java
|
||||
+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/Transport.java Wed May 04 23:23:55 2016 +0100
|
||||
++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/Transport.java Thu May 12 01:30:54 2016 +0100
|
||||
+@@ -133,7 +133,6 @@
|
||||
+ */
|
||||
+ private static void setContextClassLoader(final ClassLoader ccl) {
|
||||
+ AccessController.doPrivileged(new PrivilegedAction<Void> () {
|
||||
+- @Override
|
||||
+ public Void run() {
|
||||
+ Thread.currentThread().setContextClassLoader(ccl);
|
||||
+ return null;
|
||||
+diff -r 545db1dd8c2a src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
|
||||
+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java Wed May 04 23:23:55 2016 +0100
|
||||
++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java Thu May 12 01:30:54 2016 +0100
|
||||
+@@ -676,7 +676,6 @@
|
||||
+ connectionCount.incrementAndGet() +
|
||||
+ ")-" + remoteHost);
|
||||
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
|
||||
+- @Override
|
||||
+ public Void run() {
|
||||
+ run0();
|
||||
+ return null;
|
||||
+diff -r 545db1dd8c2a src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java
|
||||
+--- openjdk-ecj/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java Wed May 04 23:23:55 2016 +0100
|
||||
++++ openjdk-ecj/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java Thu May 12 01:30:54 2016 +0100
|
||||
+@@ -92,7 +92,6 @@
|
||||
+ return this;
|
||||
+ }
|
||||
+
|
||||
+- @Override
|
||||
+ public SurfaceData createManagedSurface(int w, int h, int transparency) {
|
||||
+ return GLXSurfaceData.createData(this, w, h,
|
||||
+ getColorModel(transparency),
|
||||
+@@ -165,12 +164,10 @@
|
||||
+ * Returns true if the provided capability bit is present for this config.
|
||||
+ * See OGLContext.java for a list of supported capabilities.
|
||||
+ */
|
||||
+- @Override
|
||||
+ public final boolean isCapPresent(int cap) {
|
||||
+ return ((oglCaps.getCaps() & cap) != 0);
|
||||
+ }
|
||||
+
|
||||
+- @Override
|
||||
+ public final long getNativeConfigInfo() {
|
||||
+ return pConfigInfo;
|
||||
+ }
|
||||
+@@ -180,7 +177,6 @@
|
||||
+ *
|
||||
+ * @see sun.java2d.pipe.hw.BufferedContextProvider#getContext
|
||||
+ */
|
||||
+- @Override
|
||||
+ public final OGLContext getContext() {
|
||||
+ return context;
|
||||
+ }
|
||||
+@@ -394,7 +390,6 @@
|
||||
+ *
|
||||
+ * @see sun.java2d.pipe.hw.AccelGraphicsConfig#createCompatibleVolatileImage
|
||||
+ */
|
||||
+- @Override
|
||||
+ public VolatileImage
|
||||
+ createCompatibleVolatileImage(int width, int height,
|
||||
+ int transparency, int type)
|
||||
+@@ -434,17 +429,14 @@
|
||||
+ *
|
||||
+ * @see sun.java2d.pipe.hw.AccelGraphicsConfig#getContextCapabilities
|
||||
+ */
|
||||
+- @Override
|
||||
+ public ContextCapabilities getContextCapabilities() {
|
||||
+ return oglCaps;
|
||||
+ }
|
||||
+
|
||||
+- @Override
|
||||
+ public void addDeviceEventListener(AccelDeviceEventListener l) {
|
||||
+ AccelDeviceEventNotifier.addListener(l, screen.getScreen());
|
||||
+ }
|
||||
+
|
||||
+- @Override
|
||||
+ public void removeDeviceEventListener(AccelDeviceEventListener l) {
|
||||
+ AccelDeviceEventNotifier.removeListener(l);
|
||||
+ }
|
||||
+diff -r 545db1dd8c2a src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
|
||||
+--- openjdk-ecj/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java Wed May 04 23:23:55 2016 +0100
|
||||
++++ openjdk-ecj/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java Thu May 12 01:51:42 2016 +0100
|
||||
+@@ -236,7 +236,6 @@
|
||||
+ final MBeanInstantiator fInstantiator = instantiator;
|
||||
+ this.secureClr = new
|
||||
+ SecureClassLoaderRepository(AccessController.doPrivileged(new PrivilegedAction<ClassLoaderRepository>() {
|
||||
+- @Override
|
||||
+ public ClassLoaderRepository run() {
|
||||
+ return fInstantiator.getClassLoaderRepository();
|
||||
+ }
|
||||
+@@ -1257,7 +1256,6 @@
|
||||
+ ClassLoader myLoader = outerShell.getClass().getClassLoader();
|
||||
+ final ModifiableClassLoaderRepository loaders = AccessController.doPrivileged(new PrivilegedAction<ModifiableClassLoaderRepository>() {
|
||||
+
|
||||
+- @Override
|
||||
+ public ModifiableClassLoaderRepository run() {
|
||||
+ return instantiator.getClassLoaderRepository();
|
||||
+ }
|
||||
+diff -r b72e7b89dda9 src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java
|
||||
+--- openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java Thu Sep 08 11:00:33 2011 -0700
|
||||
++++ openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java Thu May 12 16:39:37 2016 +0100
|
||||
+@@ -227,17 +227,14 @@
|
||||
+ allowedTypes = credentialsTypes;
|
||||
+ }
|
||||
+
|
||||
+- @Override
|
||||
+ public String getVersion() throws RemoteException {
|
||||
+ return impl.getVersion();
|
||||
+ }
|
||||
+
|
||||
+- @Override
|
||||
+ public RMIConnection newClient(Object credentials) throws IOException {
|
||||
+ return impl.newClient(credentials);
|
||||
+ }
|
||||
+
|
||||
+- @Override
|
||||
+ public void check(Method method, ObjectStreamClass descriptor,
|
||||
+ int paramIndex, int callID) {
|
||||
+
|
||||
+@@ -247,7 +244,6 @@
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+- @Override
|
||||
+ public void checkProxyClass(Method method, String[] ifaces,
|
||||
+ int paramIndex, int callID) {
|
||||
+ if (ifaces != null && ifaces.length > 0) {
|
||||
+@@ -259,7 +255,6 @@
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+- @Override
|
||||
+ public void end(int callID) {
|
||||
+ /* Do nothing */
|
||||
+ }
|
||||
diff -r c23ceebb80a1 -r 60be25a84f2d patches/openjdk/8014205-blank_swing_dialogs_windows.patch
|
||||
--- a/patches/openjdk/8014205-blank_swing_dialogs_windows.patch Sun May 08 21:28:21 2016 +0100
|
||||
+++ b/patches/openjdk/8014205-blank_swing_dialogs_windows.patch Fri May 13 14:02:18 2016 +0100
|
||||
@@ -116,7 +116,7 @@
|
||||
{
|
||||
if (numBands == 3 && !ccm.hasAlpha()) {
|
||||
imageType = TYPE_3BYTE_BGR;
|
||||
-@@ -804,6 +801,27 @@
|
||||
+@@ -804,6 +801,26 @@
|
||||
} // else if ((raster instanceof ByteComponentRaster) &&
|
||||
}
|
||||
|
||||
@@ -129,7 +129,6 @@
|
||||
+ new PrivilegedAction<Boolean>()
|
||||
+ {
|
||||
+
|
||||
-+ @Override
|
||||
+ public Boolean run() {
|
||||
+ final ClassLoader std = System.class.getClassLoader();
|
||||
+
|
||||
|
54
gnu/packages/patches/id3lib-CVE-2007-4460.patch
Normal file
54
gnu/packages/patches/id3lib-CVE-2007-4460.patch
Normal file
|
@ -0,0 +1,54 @@
|
|||
This patch fixes an issues where temporary files were created in an insecure
|
||||
way.
|
||||
|
||||
It was first intruduced in version 3.8.3-7 and fixes
|
||||
http://bugs.debian.org/438540
|
||||
--- a/src/tag_file.cpp
|
||||
+++ b/src/tag_file.cpp
|
||||
@@ -242,8 +242,8 @@
|
||||
strcpy(sTempFile, filename.c_str());
|
||||
strcat(sTempFile, sTmpSuffix.c_str());
|
||||
|
||||
-#if ((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP))
|
||||
- // This section is for Windows folk && gcc 3.x folk
|
||||
+#if !defined(HAVE_MKSTEMP)
|
||||
+ // This section is for Windows folk
|
||||
fstream tmpOut;
|
||||
createFile(sTempFile, tmpOut);
|
||||
|
||||
@@ -257,7 +257,7 @@
|
||||
tmpOut.write((char *)tmpBuffer, nBytes);
|
||||
}
|
||||
|
||||
-#else //((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP))
|
||||
+#else //!defined(HAVE_MKSTEMP)
|
||||
|
||||
// else we gotta make a temp file, copy the tag into it, copy the
|
||||
// rest of the old file after the tag, delete the old file, rename
|
||||
@@ -270,7 +270,7 @@
|
||||
//ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file");
|
||||
}
|
||||
|
||||
- ofstream tmpOut(fd);
|
||||
+ ofstream tmpOut(sTempFile);
|
||||
if (!tmpOut)
|
||||
{
|
||||
tmpOut.close();
|
||||
@@ -285,14 +285,14 @@
|
||||
uchar tmpBuffer[BUFSIZ];
|
||||
while (file)
|
||||
{
|
||||
- file.read(tmpBuffer, BUFSIZ);
|
||||
+ file.read((char *)tmpBuffer, BUFSIZ);
|
||||
size_t nBytes = file.gcount();
|
||||
- tmpOut.write(tmpBuffer, nBytes);
|
||||
+ tmpOut.write((char *)tmpBuffer, nBytes);
|
||||
}
|
||||
|
||||
close(fd); //closes the file
|
||||
|
||||
-#endif ////((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP))
|
||||
+#endif ////!defined(HAVE_MKSTEMP)
|
||||
|
||||
tmpOut.close();
|
||||
file.close();
|
125
gnu/packages/patches/jansson-CVE-2016-4425.patch
Normal file
125
gnu/packages/patches/jansson-CVE-2016-4425.patch
Normal file
File diff suppressed because one or more lines are too long
118
gnu/packages/patches/libtar-CVE-2013-4420.patch
Normal file
118
gnu/packages/patches/libtar-CVE-2013-4420.patch
Normal file
|
@ -0,0 +1,118 @@
|
|||
Author: Raphael Geissert <geissert@debian.org>
|
||||
Bug-Debian: https://bugs.debian.org/731860
|
||||
Description: Avoid directory traversal when extracting archives
|
||||
by skipping over leading slashes and any prefix containing ".." components.
|
||||
Forwarded: yes
|
||||
|
||||
--- a/lib/decode.c
|
||||
+++ b/lib/decode.c
|
||||
@@ -22,6 +22,36 @@
|
||||
#endif
|
||||
|
||||
|
||||
+char *
|
||||
+safer_name_suffix (char const *file_name)
|
||||
+{
|
||||
+ char const *p, *t;
|
||||
+ p = t = file_name;
|
||||
+ while (*p == '/') t = ++p;
|
||||
+ while (*p)
|
||||
+ {
|
||||
+ while (p[0] == '.' && p[0] == p[1] && p[2] == '/')
|
||||
+ {
|
||||
+ p += 3;
|
||||
+ t = p;
|
||||
+ }
|
||||
+ /* advance pointer past the next slash */
|
||||
+ while (*p && (p++)[0] != '/');
|
||||
+ }
|
||||
+
|
||||
+ if (!*t)
|
||||
+ {
|
||||
+ t = ".";
|
||||
+ }
|
||||
+
|
||||
+ if (t != file_name)
|
||||
+ {
|
||||
+ /* TODO: warn somehow that the path was modified */
|
||||
+ }
|
||||
+ return (char*)t;
|
||||
+}
|
||||
+
|
||||
+
|
||||
/* determine full path name */
|
||||
char *
|
||||
th_get_pathname(TAR *t)
|
||||
@@ -29,17 +59,17 @@ th_get_pathname(TAR *t)
|
||||
static char filename[MAXPATHLEN];
|
||||
|
||||
if (t->th_buf.gnu_longname)
|
||||
- return t->th_buf.gnu_longname;
|
||||
+ return safer_name_suffix(t->th_buf.gnu_longname);
|
||||
|
||||
if (t->th_buf.prefix[0] != '\0')
|
||||
{
|
||||
snprintf(filename, sizeof(filename), "%.155s/%.100s",
|
||||
t->th_buf.prefix, t->th_buf.name);
|
||||
- return filename;
|
||||
+ return safer_name_suffix(filename);
|
||||
}
|
||||
|
||||
snprintf(filename, sizeof(filename), "%.100s", t->th_buf.name);
|
||||
- return filename;
|
||||
+ return safer_name_suffix(filename);
|
||||
}
|
||||
|
||||
|
||||
--- a/lib/extract.c
|
||||
+++ b/lib/extract.c
|
||||
@@ -298,14 +298,14 @@ tar_extract_hardlink(TAR * t, char *real
|
||||
if (mkdirhier(dirname(filename)) == -1)
|
||||
return -1;
|
||||
libtar_hashptr_reset(&hp);
|
||||
- if (libtar_hash_getkey(t->h, &hp, th_get_linkname(t),
|
||||
+ if (libtar_hash_getkey(t->h, &hp, safer_name_suffix(th_get_linkname(t)),
|
||||
(libtar_matchfunc_t)libtar_str_match) != 0)
|
||||
{
|
||||
lnp = (char *)libtar_hashptr_data(&hp);
|
||||
linktgt = &lnp[strlen(lnp) + 1];
|
||||
}
|
||||
else
|
||||
- linktgt = th_get_linkname(t);
|
||||
+ linktgt = safer_name_suffix(th_get_linkname(t));
|
||||
|
||||
#ifdef DEBUG
|
||||
printf(" ==> extracting: %s (link to %s)\n", filename, linktgt);
|
||||
@@ -343,9 +343,9 @@ tar_extract_symlink(TAR *t, char *realna
|
||||
|
||||
#ifdef DEBUG
|
||||
printf(" ==> extracting: %s (symlink to %s)\n",
|
||||
- filename, th_get_linkname(t));
|
||||
+ filename, safer_name_suffix(th_get_linkname(t)));
|
||||
#endif
|
||||
- if (symlink(th_get_linkname(t), filename) == -1)
|
||||
+ if (symlink(safer_name_suffix(th_get_linkname(t)), filename) == -1)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
perror("symlink()");
|
||||
--- a/lib/internal.h
|
||||
+++ b/lib/internal.h
|
||||
@@ -15,3 +15,4 @@
|
||||
|
||||
#include <libtar.h>
|
||||
|
||||
+char* safer_name_suffix(char const*);
|
||||
--- a/lib/output.c
|
||||
+++ b/lib/output.c
|
||||
@@ -123,9 +123,9 @@ th_print_long_ls(TAR *t)
|
||||
else
|
||||
printf(" link to ");
|
||||
if ((t->options & TAR_GNU) && t->th_buf.gnu_longlink != NULL)
|
||||
- printf("%s", t->th_buf.gnu_longlink);
|
||||
+ printf("%s", safer_name_suffix(t->th_buf.gnu_longlink));
|
||||
else
|
||||
- printf("%.100s", t->th_buf.linkname);
|
||||
+ printf("%.100s", safer_name_suffix(t->th_buf.linkname));
|
||||
}
|
||||
|
||||
putchar('\n');
|
30
gnu/packages/patches/libyaml-CVE-2014-9130.patch
Normal file
30
gnu/packages/patches/libyaml-CVE-2014-9130.patch
Normal file
|
@ -0,0 +1,30 @@
|
|||
Fixes CVE-2014-9130
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-9130
|
||||
|
||||
Upstream source:
|
||||
https://bitbucket.org/xi/libyaml/commits/2b9156756423e967cfd09a61d125d883fca6f4f2
|
||||
|
||||
# HG changeset patch
|
||||
# User Kirill Simonov <xi@resolvent.net>
|
||||
# Date 1417197312 21600
|
||||
# Node ID 2b9156756423e967cfd09a61d125d883fca6f4f2
|
||||
# Parent 053f53a381ff6adbbc93a31ab7fdee06a16c8a33
|
||||
Removed invalid simple key assertion (thank to Jonathan Gray).
|
||||
|
||||
diff --git a/src/scanner.c b/src/scanner.c
|
||||
--- a/src/scanner.c
|
||||
+++ b/src/scanner.c
|
||||
@@ -1106,13 +1106,6 @@
|
||||
&& parser->indent == (ptrdiff_t)parser->mark.column);
|
||||
|
||||
/*
|
||||
- * A simple key is required only when it is the first token in the current
|
||||
- * line. Therefore it is always allowed. But we add a check anyway.
|
||||
- */
|
||||
-
|
||||
- assert(parser->simple_key_allowed || !required); /* Impossible. */
|
||||
-
|
||||
- /*
|
||||
* If the current position may start a simple key, save it.
|
||||
*/
|
||||
|
20
gnu/packages/patches/lua-CVE-2014-5461.patch
Normal file
20
gnu/packages/patches/lua-CVE-2014-5461.patch
Normal file
|
@ -0,0 +1,20 @@
|
|||
From: Enrico Tassi <gareuselesinge@debian.org>
|
||||
Date: Tue, 26 Aug 2014 16:20:55 +0200
|
||||
Subject: Fix stack overflow in vararg functions
|
||||
|
||||
---
|
||||
src/ldo.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/ldo.c b/src/ldo.c
|
||||
index d1bf786..30333bf 100644
|
||||
--- a/src/ldo.c
|
||||
+++ b/src/ldo.c
|
||||
@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
|
||||
CallInfo *ci;
|
||||
StkId st, base;
|
||||
Proto *p = cl->p;
|
||||
- luaD_checkstack(L, p->maxstacksize);
|
||||
+ luaD_checkstack(L, p->maxstacksize + p->numparams);
|
||||
func = restorestack(L, funcr);
|
||||
base = func + 1;
|
33
gnu/packages/patches/mcrypt-CVE-2012-4409.patch
Normal file
33
gnu/packages/patches/mcrypt-CVE-2012-4409.patch
Normal file
|
@ -0,0 +1,33 @@
|
|||
From 4876e3a692739bb9ca00d0f500fd5f4b3eb16ce3 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Callaway <spot@fedoraproject.org>
|
||||
Date: Fri, 7 Sep 2012 11:39:29 -0400
|
||||
Subject: apply fix for CVE-2012-4409 (thanks to Raphael Geissert)
|
||||
|
||||
---
|
||||
mcrypt-CVE-2012-4409.patch | 12 ++++++++++++
|
||||
mcrypt.spec | 10 +++++++++-
|
||||
2 files changed, 21 insertions(+), 1 deletion(-)
|
||||
create mode 100644 mcrypt-CVE-2012-4409.patch
|
||||
|
||||
diff --git a/mcrypt-CVE-2012-4409.patch b/mcrypt-CVE-2012-4409.patch
|
||||
new file mode 100644
|
||||
index 0000000..747f428
|
||||
--- /dev/null
|
||||
+++ b/mcrypt-CVE-2012-4409.patch
|
||||
@@ -0,0 +1,12 @@
|
||||
+diff -up mcrypt-2.6.8/src/extra.c.CVE-2012-4409 mcrypt-2.6.8/src/extra.c
|
||||
+--- mcrypt-2.6.8/src/extra.c.CVE-2012-4409 2012-09-07 11:00:55.906870746 -0400
|
||||
++++ mcrypt-2.6.8/src/extra.c 2012-09-07 11:00:27.967858365 -0400
|
||||
+@@ -242,6 +242,8 @@ int check_file_head(FILE * fstream, char
|
||||
+ if (m_getbit(0, sflag) != 0) { /* if the first bit is set */
|
||||
+ *salt_size = m_setbit(0, sflag, 0);
|
||||
+ if (*salt_size > 0) {
|
||||
++ if (*salt_size > sizeof(tmp_buf))
|
||||
++ err_quit(_("Salt is too long\n"));
|
||||
+ fread(tmp_buf, 1, *salt_size,
|
||||
+ fstream);
|
||||
+ memmove(salt, tmp_buf, *salt_size);
|
||||
|
||||
--
|
||||
cgit v0.12
|
||||
|
36
gnu/packages/patches/mcrypt-CVE-2012-4426.patch
Normal file
36
gnu/packages/patches/mcrypt-CVE-2012-4426.patch
Normal file
|
@ -0,0 +1,36 @@
|
|||
diff --git a/mcrypt-CVE-2012-4426.patch b/mcrypt-CVE-2012-4426.patch
|
||||
new file mode 100644
|
||||
index 0000000..747f428
|
||||
--- mcrypt-2.6.8/src/errors.c
|
||||
+++ mcrypt-2.6.8/src/errors.c
|
||||
@@ -25,24 +25,24 @@
|
||||
|
||||
void err_quit(char *errmsg)
|
||||
{
|
||||
- fprintf(stderr, errmsg);
|
||||
+ fprintf(stderr, "%s", errmsg);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
void err_warn(char *errmsg)
|
||||
{
|
||||
if (quiet <= 1)
|
||||
- fprintf(stderr, errmsg);
|
||||
+ fprintf(stderr, "%s", errmsg);
|
||||
}
|
||||
|
||||
void err_info(char *errmsg)
|
||||
{
|
||||
if (quiet == 0)
|
||||
- fprintf(stderr, errmsg);
|
||||
+ fprintf(stderr, "%s", errmsg);
|
||||
}
|
||||
|
||||
void err_crit(char *errmsg)
|
||||
{
|
||||
if (quiet <= 2)
|
||||
- fprintf(stderr, errmsg);
|
||||
+ fprintf(stderr, "%s", errmsg);
|
||||
}
|
||||
|
||||
---
|
111
gnu/packages/patches/mcrypt-CVE-2012-4527.patch
Normal file
111
gnu/packages/patches/mcrypt-CVE-2012-4527.patch
Normal file
|
@ -0,0 +1,111 @@
|
|||
From b0716eac4e800a0ea53e1b949250f671702f28a0 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Callaway <spot@fedoraproject.org>
|
||||
Date: Tue, 30 Oct 2012 15:39:24 -0400
|
||||
Subject: apply workaround to CVE-2012-4527
|
||||
|
||||
---
|
||||
mcrypt-CVE-2012-4527-80-width-patch | 91 +++++++++++++++++++++++++++++++++++++
|
||||
mcrypt.spec | 10 +++-
|
||||
2 files changed, 100 insertions(+), 1 deletion(-)
|
||||
create mode 100644 mcrypt-CVE-2012-4527-80-width-patch
|
||||
|
||||
diff --git a/mcrypt-CVE-2012-4527-80-width-patch b/mcrypt-CVE-2012-4527-80-width-patch
|
||||
new file mode 100644
|
||||
index 0000000..0eb94d8
|
||||
--- /dev/null
|
||||
+++ b/mcrypt-CVE-2012-4527-80-width-patch
|
||||
@@ -0,0 +1,91 @@
|
||||
+--- mcrypt-2.6.8.orig/src/mcrypt.c
|
||||
++++ mcrypt-2.6.8/src/mcrypt.c
|
||||
+@@ -41,6 +41,8 @@
|
||||
+ # include <time.h>
|
||||
+ #endif
|
||||
+
|
||||
++#define WIDTH 80
|
||||
++
|
||||
+ static char rcsid[] =
|
||||
+ "$Id: mcrypt.c,v 1.2 2007/11/07 17:10:21 nmav Exp $";
|
||||
+
|
||||
+@@ -482,7 +484,7 @@
|
||||
+ #ifdef HAVE_STAT
|
||||
+ if (stream_flag == FALSE) {
|
||||
+ if (is_normal_file(file[i]) == FALSE) {
|
||||
+- sprintf(tmperr,
|
||||
++ snprintf(tmperr, WIDTH,
|
||||
+ _
|
||||
+ ("%s: %s is not a regular file. Skipping...\n"),
|
||||
+ program_name, file[i]);
|
||||
+@@ -501,7 +503,7 @@
|
||||
+ dinfile = file[i];
|
||||
+ if ((isatty(fileno((FILE *) (stdin))) == 1)
|
||||
+ && (stream_flag == TRUE) && (force == 0)) { /* not a tty */
|
||||
+- sprintf(tmperr,
|
||||
++ snprintf(tmperr, WIDTH,
|
||||
+ _
|
||||
+ ("%s: Encrypted data will not be read from a terminal.\n"),
|
||||
+ program_name);
|
||||
+@@ -520,7 +522,7 @@
|
||||
+ einfile = file[i];
|
||||
+ if ((isatty(fileno((FILE *) (stdout))) == 1)
|
||||
+ && (stream_flag == TRUE) && (force == 0)) { /* not a tty */
|
||||
+- sprintf(tmperr,
|
||||
++ snprintf(tmperr, WIDTH,
|
||||
+ _
|
||||
+ ("%s: Encrypted data will not be written to a terminal.\n"),
|
||||
+ program_name);
|
||||
+@@ -544,7 +546,7 @@
|
||||
+ strcpy(outfile, einfile);
|
||||
+ /* if file has already the .nc ignore it */
|
||||
+ if (strstr(outfile, ".nc") != NULL) {
|
||||
+- sprintf(tmperr,
|
||||
++ snprintf(tmperr, WIDTH,
|
||||
+ _
|
||||
+ ("%s: file %s has the .nc suffix... skipping...\n"),
|
||||
+ program_name, outfile);
|
||||
+@@ -590,10 +592,10 @@
|
||||
+
|
||||
+ if (x == 0) {
|
||||
+ if (stream_flag == FALSE) {
|
||||
+- sprintf(tmperr, _("File %s was decrypted.\n"), dinfile);
|
||||
++ snprintf(tmperr, WIDTH, _("File %s was decrypted.\n"), dinfile);
|
||||
+ err_warn(tmperr);
|
||||
+ } else {
|
||||
+- sprintf(tmperr, _("Stdin was decrypted.\n"));
|
||||
++ snprintf(tmperr, WIDTH, _("Stdin was decrypted.\n"));
|
||||
+ err_warn(tmperr);
|
||||
+ }
|
||||
+ #ifdef HAVE_STAT
|
||||
+@@ -610,7 +612,7 @@
|
||||
+
|
||||
+ } else {
|
||||
+ if (stream_flag == FALSE) {
|
||||
+- sprintf(tmperr,
|
||||
++ snprintf(tmperr, WIDTH,
|
||||
+ _
|
||||
+ ("File %s was NOT decrypted successfully.\n"),
|
||||
+ dinfile);
|
||||
+@@ -636,10 +638,10 @@
|
||||
+
|
||||
+ if (x == 0) {
|
||||
+ if (stream_flag == FALSE) {
|
||||
+- sprintf(tmperr, _("File %s was encrypted.\n"), einfile);
|
||||
++ snprintf(tmperr, WIDTH, _("File %s was encrypted.\n"), einfile);
|
||||
+ err_warn(tmperr);
|
||||
+ } else {
|
||||
+- sprintf(tmperr, _("Stdin was encrypted.\n"));
|
||||
++ snprintf(tmperr, WIDTH, _("Stdin was encrypted.\n"));
|
||||
+ err_warn(tmperr);
|
||||
+ }
|
||||
+ #ifdef HAVE_STAT
|
||||
+@@ -655,7 +657,7 @@
|
||||
+
|
||||
+ } else {
|
||||
+ if (stream_flag == FALSE) {
|
||||
+- sprintf(tmperr,
|
||||
++ snprintf(tmperr, WIDTH,
|
||||
+ _
|
||||
+ ("File %s was NOT encrypted successfully.\n"),
|
||||
+ einfile);
|
||||
--
|
||||
cgit v0.12
|
||||
|
179
gnu/packages/patches/pcre2-CVE-2016-3191.patch
Normal file
179
gnu/packages/patches/pcre2-CVE-2016-3191.patch
Normal file
|
@ -0,0 +1,179 @@
|
|||
Fixes CVE-2016-3191 (remote execution of arbitrary code or denial of
|
||||
service (stack-based buffer overflow) via a crafted regular expression).
|
||||
|
||||
See <https://bugzilla.redhat.com/show_bug.cgi?id=1311503>.
|
||||
|
||||
This is svn r489 at <svn://vcs.exim.org/pcre2/code>, omitting the
|
||||
changes to 'testdata/testoutput8-16-4', which does not exist in the
|
||||
source tarball.
|
||||
|
||||
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@489 6239d852-aaf2-0410-a92c-79f79f948069
|
||||
---
|
||||
ChangeLog | 4 ++++
|
||||
src/pcre2_compile.c | 16 ++++++++++++++--
|
||||
testdata/testinput8 | 2 ++
|
||||
testdata/testoutput8-16-2 | 3 +++
|
||||
testdata/testoutput8-16-3 | 3 +++
|
||||
testdata/testoutput8-16-4 | 3 +++
|
||||
testdata/testoutput8-32-2 | 3 +++
|
||||
testdata/testoutput8-32-3 | 3 +++
|
||||
testdata/testoutput8-32-4 | 3 +++
|
||||
testdata/testoutput8-8-2 | 3 +++
|
||||
testdata/testoutput8-8-3 | 3 +++
|
||||
testdata/testoutput8-8-4 | 3 +++
|
||||
12 files changed, 47 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/ChangeLog b/ChangeLog
|
||||
index 3ce0207..65e333e 100644
|
||||
--- a/ChangeLog
|
||||
+++ b/ChangeLog
|
||||
@@ -58,6 +58,10 @@ some head-scratching the next time this happens.
|
||||
assertion, caused pcre2test to output a very large number of spaces when the
|
||||
callout was taken, making the program appearing to loop.
|
||||
|
||||
+12. A pattern that included (*ACCEPT) in the middle of a sufficiently deeply
|
||||
+nested set of parentheses of sufficient size caused an overflow of the
|
||||
+compiling workspace (which was diagnosed, but of course is not desirable).
|
||||
+
|
||||
|
||||
Version 10.21 12-January-2016
|
||||
-----------------------------
|
||||
diff --git a/src/pcre2_compile.c b/src/pcre2_compile.c
|
||||
index e33d620..887fbfd 100644
|
||||
--- a/src/pcre2_compile.c
|
||||
+++ b/src/pcre2_compile.c
|
||||
@@ -5901,10 +5901,22 @@ for (;; ptr++)
|
||||
goto FAILED;
|
||||
}
|
||||
cb->had_accept = TRUE;
|
||||
+
|
||||
+ /* In the first pass, just accumulate the length required;
|
||||
+ otherwise hitting (*ACCEPT) inside many nested parentheses can
|
||||
+ cause workspace overflow. */
|
||||
+
|
||||
for (oc = cb->open_caps; oc != NULL; oc = oc->next)
|
||||
{
|
||||
- *code++ = OP_CLOSE;
|
||||
- PUT2INC(code, 0, oc->number);
|
||||
+ if (lengthptr != NULL)
|
||||
+ {
|
||||
+ *lengthptr += CU2BYTES(1) + IMM2_SIZE;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ *code++ = OP_CLOSE;
|
||||
+ PUT2INC(code, 0, oc->number);
|
||||
+ }
|
||||
}
|
||||
setverb = *code++ =
|
||||
(cb->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
|
||||
diff --git a/testdata/testinput8 b/testdata/testinput8
|
||||
index ca3b1b9..7e2a1f0 100644
|
||||
--- a/testdata/testinput8
|
||||
+++ b/testdata/testinput8
|
||||
@@ -182,4 +182,6 @@
|
||||
|
||||
/((?1)(?2)(?3)(?4)(?5)(?6)(?7)(?8)(?9)(?9)(?8)(?7)(?6)(?5)(?4)(?3)(?2)(?1)(?0)){2,}()()()()()()()()()/debug
|
||||
|
||||
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
|
||||
+
|
||||
# End of testinput8
|
||||
diff --git a/testdata/testoutput8-16-2 b/testdata/testoutput8-16-2
|
||||
index 05669bb..a5e8dec 100644
|
||||
--- a/testdata/testoutput8-16-2
|
||||
+++ b/testdata/testoutput8-16-2
|
||||
@@ -1027,4 +1027,7 @@ Capturing subpattern count = 10
|
||||
May match empty string
|
||||
Subject length lower bound = 0
|
||||
|
||||
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
|
||||
+Failed: error 186 at offset 490: regular expression is too complicated
|
||||
+
|
||||
# End of testinput8
|
||||
diff --git a/testdata/testoutput8-16-3 b/testdata/testoutput8-16-3
|
||||
index 31884e1..36133b3 100644
|
||||
--- a/testdata/testoutput8-16-3
|
||||
+++ b/testdata/testoutput8-16-3
|
||||
@@ -1023,4 +1023,7 @@ Capturing subpattern count = 10
|
||||
May match empty string
|
||||
Subject length lower bound = 0
|
||||
|
||||
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
|
||||
+Failed: error 114 at offset 509: missing closing parenthesis
|
||||
+
|
||||
# End of testinput8
|
||||
diff --git a/testdata/testoutput8-32-2 b/testdata/testoutput8-32-2
|
||||
index babd0c7..99c4fad 100644
|
||||
--- a/testdata/testoutput8-32-2
|
||||
+++ b/testdata/testoutput8-32-2
|
||||
@@ -1023,4 +1023,7 @@ Capturing subpattern count = 10
|
||||
May match empty string
|
||||
Subject length lower bound = 0
|
||||
|
||||
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
|
||||
+Failed: error 114 at offset 509: missing closing parenthesis
|
||||
+
|
||||
# End of testinput8
|
||||
diff --git a/testdata/testoutput8-32-3 b/testdata/testoutput8-32-3
|
||||
index babd0c7..99c4fad 100644
|
||||
--- a/testdata/testoutput8-32-3
|
||||
+++ b/testdata/testoutput8-32-3
|
||||
@@ -1023,4 +1023,7 @@ Capturing subpattern count = 10
|
||||
May match empty string
|
||||
Subject length lower bound = 0
|
||||
|
||||
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
|
||||
+Failed: error 114 at offset 509: missing closing parenthesis
|
||||
+
|
||||
# End of testinput8
|
||||
diff --git a/testdata/testoutput8-32-4 b/testdata/testoutput8-32-4
|
||||
index babd0c7..99c4fad 100644
|
||||
--- a/testdata/testoutput8-32-4
|
||||
+++ b/testdata/testoutput8-32-4
|
||||
@@ -1023,4 +1023,7 @@ Capturing subpattern count = 10
|
||||
May match empty string
|
||||
Subject length lower bound = 0
|
||||
|
||||
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
|
||||
+Failed: error 114 at offset 509: missing closing parenthesis
|
||||
+
|
||||
# End of testinput8
|
||||
diff --git a/testdata/testoutput8-8-2 b/testdata/testoutput8-8-2
|
||||
index 6a9aa0a..6dc1f42 100644
|
||||
--- a/testdata/testoutput8-8-2
|
||||
+++ b/testdata/testoutput8-8-2
|
||||
@@ -1026,4 +1026,7 @@ Capturing subpattern count = 10
|
||||
May match empty string
|
||||
Subject length lower bound = 0
|
||||
|
||||
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
|
||||
+Failed: error 114 at offset 509: missing closing parenthesis
|
||||
+
|
||||
# End of testinput8
|
||||
diff --git a/testdata/testoutput8-8-3 b/testdata/testoutput8-8-3
|
||||
index 2fe1168..ae14946 100644
|
||||
--- a/testdata/testoutput8-8-3
|
||||
+++ b/testdata/testoutput8-8-3
|
||||
@@ -1024,4 +1024,7 @@ Capturing subpattern count = 10
|
||||
May match empty string
|
||||
Subject length lower bound = 0
|
||||
|
||||
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
|
||||
+Failed: error 114 at offset 509: missing closing parenthesis
|
||||
+
|
||||
# End of testinput8
|
||||
diff --git a/testdata/testoutput8-8-4 b/testdata/testoutput8-8-4
|
||||
index 91993b2..6c79956 100644
|
||||
--- a/testdata/testoutput8-8-4
|
||||
+++ b/testdata/testoutput8-8-4
|
||||
@@ -1022,4 +1022,7 @@ Capturing subpattern count = 10
|
||||
May match empty string
|
||||
Subject length lower bound = 0
|
||||
|
||||
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
|
||||
+Failed: error 114 at offset 509: missing closing parenthesis
|
||||
+
|
||||
# End of testinput8
|
||||
--
|
||||
2.8.3
|
||||
|
26
gnu/packages/patches/procmail-CVE-2014-3618.patch
Normal file
26
gnu/packages/patches/procmail-CVE-2014-3618.patch
Normal file
|
@ -0,0 +1,26 @@
|
|||
Fixes CVE-2014-3618 (heap overflow in formisc.c allowing denial of
|
||||
service and potential remote execution of arbitrary code).
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-3618
|
||||
|
||||
Source:
|
||||
http://seclists.org/oss-sec/2014/q3/495
|
||||
|
||||
Adopted by Debian as patch '27':
|
||||
https://sources.debian.net/src/procmail/3.22-25/debian/patches/27/
|
||||
|
||||
--- a/src/formisc.c
|
||||
+++ b/src/formisc.c
|
||||
@@ -84,12 +84,11 @@
|
||||
case '"':*target++=delim='"';start++;
|
||||
}
|
||||
;{ int i;
|
||||
- do
|
||||
+ while(*start)
|
||||
if((i= *target++= *start++)==delim) /* corresponding delimiter? */
|
||||
break;
|
||||
else if(i=='\\'&&*start) /* skip quoted character */
|
||||
*target++= *start++;
|
||||
- while(*start); /* anything? */
|
||||
}
|
||||
hitspc=2;
|
||||
}
|
25
gnu/packages/patches/rpm-CVE-2014-8118.patch
Normal file
25
gnu/packages/patches/rpm-CVE-2014-8118.patch
Normal file
|
@ -0,0 +1,25 @@
|
|||
Fix CVE-2014-8118 (integer overflow allowing arbitrary remote code
|
||||
execution via crafted CPIO header).
|
||||
|
||||
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-8118
|
||||
|
||||
Source:
|
||||
https://bugzilla.redhat.com/attachment.cgi?id=962159&action=diff
|
||||
|
||||
Adopted by Debian:
|
||||
http://anonscm.debian.org/cgit/collab-maint/rpm.git/plain/debian/patches/CVE-2014-8118.patch
|
||||
|
||||
diff --git a/lib/cpio.c b/lib/cpio.c
|
||||
index 253ff0f..600633a 100644
|
||||
--- a/lib/cpio.c
|
||||
+++ b/lib/cpio.c
|
||||
@@ -399,6 +399,9 @@ int rpmcpioHeaderRead(rpmcpio_t cpio, char ** path, int * fx)
|
||||
|
||||
GET_NUM_FIELD(hdr.filesize, fsize);
|
||||
GET_NUM_FIELD(hdr.namesize, nameSize);
|
||||
+ if (nameSize <= 0 || nameSize > 4096) {
|
||||
+ return RPMERR_BAD_HEADER;
|
||||
+ }
|
||||
|
||||
char name[nameSize + 1];
|
||||
read = Fread(name, nameSize, 1, cpio->fd);
|
23
gnu/packages/patches/rush-CVE-2013-6889.patch
Normal file
23
gnu/packages/patches/rush-CVE-2013-6889.patch
Normal file
|
@ -0,0 +1,23 @@
|
|||
commit 00bdccd429517f12dbf37ab4397ddec3e51a2738
|
||||
Author: Mats Erik Andersson <gnu@gisladisker.se>
|
||||
Date: Mon Jan 20 13:33:52 2014 +0200
|
||||
|
||||
Protect against CVE-2013-6889 (tiny change).
|
||||
|
||||
Reset the effective user identification in testing mode.
|
||||
|
||||
diff --git a/src/rush.c b/src/rush.c
|
||||
index 45d737a..dc6518e 100644
|
||||
--- a/src/rush.c
|
||||
+++ b/src/rush.c
|
||||
@@ -980,6 +980,10 @@ main(int argc, char **argv)
|
||||
} else if (argc > optind)
|
||||
die(usage_error, NULL, _("invalid command line"));
|
||||
|
||||
+ /* Relinquish root privileges in test mode */
|
||||
+ if (lint_option)
|
||||
+ setuid(getuid());
|
||||
+
|
||||
if (test_user_name) {
|
||||
struct passwd *pw = getpwnam(test_user_name);
|
||||
if (!pw)
|
24
gnu/packages/patches/t1lib-CVE-2010-2642.patch
Normal file
24
gnu/packages/patches/t1lib-CVE-2010-2642.patch
Normal file
|
@ -0,0 +1,24 @@
|
|||
diff --git a/lib/t1lib/parseAFM.c b/lib/t1lib/parseAFM.c
|
||||
index 6a31d7f..ba64541 100644
|
||||
--- a/lib/t1lib/parseAFM.c
|
||||
+++ b/lib/t1lib/parseAFM.c
|
||||
@@ -199,7 +199,9 @@ static char *token(stream)
|
||||
idx = 0;
|
||||
|
||||
while (ch != EOF && ch != ' ' && ch != CR && ch != LF &&
|
||||
- ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';'){
|
||||
+ ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';'
|
||||
+ && idx < (MAX_NAME -1))
|
||||
+ {
|
||||
ident[idx++] = ch;
|
||||
ch = fgetc(stream);
|
||||
} /* while */
|
||||
@@ -235,7 +237,7 @@ static char *linetoken(stream)
|
||||
while ((ch = fgetc(stream)) == ' ' || ch == '\t' );
|
||||
|
||||
idx = 0;
|
||||
- while (ch != EOF && ch != CR && ch != LF && ch != CTRL_Z)
|
||||
+ while (ch != EOF && ch != CR && ch != LF && ch != CTRL_Z && idx < (MAX_NAME - 1))
|
||||
{
|
||||
ident[idx++] = ch;
|
||||
ch = fgetc(stream);
|
32
gnu/packages/patches/t1lib-CVE-2011-0764.patch
Normal file
32
gnu/packages/patches/t1lib-CVE-2011-0764.patch
Normal file
|
@ -0,0 +1,32 @@
|
|||
Description: Don't lookup previous point if there isn't any
|
||||
Author: Marc Deslauriers <marc.deslauriers@canonical.com>
|
||||
Forwarded: no
|
||||
|
||||
Index: t1lib-5.1.2/lib/type1/type1.c
|
||||
===================================================================
|
||||
--- t1lib-5.1.2.orig/lib/type1/type1.c 2011-12-13 14:24:14.280965637 -0600
|
||||
+++ t1lib-5.1.2/lib/type1/type1.c 2011-12-13 14:25:25.893320747 -0600
|
||||
@@ -1700,6 +1700,7 @@
|
||||
long pindex = 0;
|
||||
|
||||
/* compute hinting for previous segment! */
|
||||
+ if (ppoints == NULL) Error0i("RLineTo: No previous point!\n");
|
||||
FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx, dy);
|
||||
|
||||
/* Allocate a new path point and pre-setup data */
|
||||
@@ -1728,6 +1729,7 @@
|
||||
long pindex = 0;
|
||||
|
||||
/* compute hinting for previous point! */
|
||||
+ if (ppoints == NULL) Error0i("RRCurveTo: No previous point!\n");
|
||||
FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx1, dy1);
|
||||
|
||||
/* Allocate three new path points and pre-setup data */
|
||||
@@ -1903,6 +1905,7 @@
|
||||
FindStems( currx, curry, 0, 0, dx, dy);
|
||||
}
|
||||
else {
|
||||
+ if (ppoints == NULL) Error0i("RMoveTo: No previous point!\n");
|
||||
FindStems( currx, curry, ppoints[numppoints-2].x, ppoints[numppoints-2].y, dx, dy);
|
||||
}
|
||||
|
|
@ -0,0 +1,133 @@
|
|||
Author: Jaroslav Škarvada <jskarvad@redhat.com>
|
||||
Description: Fix more crashes on oversized fonts
|
||||
Bug-Redhat: http://bugzilla.redhat.com/show_bug.cgi?id=692909
|
||||
Index: t1lib-5.1.2/lib/type1/lines.c
|
||||
===================================================================
|
||||
--- t1lib-5.1.2.orig/lib/type1/lines.c 2007-12-23 09:49:42.000000000 -0600
|
||||
+++ t1lib-5.1.2/lib/type1/lines.c 2012-01-17 14:15:08.000000000 -0600
|
||||
@@ -67,6 +67,10 @@
|
||||
None.
|
||||
*/
|
||||
|
||||
+#define BITS (sizeof(LONG)*8)
|
||||
+#define HIGHTEST(p) (((p)>>(BITS-2)) != 0) /* includes sign bit */
|
||||
+#define TOOBIG(xy) ((xy < 0) ? HIGHTEST(-xy) : HIGHTEST(xy))
|
||||
+
|
||||
/*
|
||||
:h2.StepLine() - Produces Run Ends for a Line After Checks
|
||||
|
||||
@@ -84,6 +88,9 @@
|
||||
IfTrace4((LineDebug > 0), ".....StepLine: (%d,%d) to (%d,%d)\n",
|
||||
x1, y1, x2, y2);
|
||||
|
||||
+ if ( TOOBIG(x1) || TOOBIG(x2) || TOOBIG(y1) || TOOBIG(y2))
|
||||
+ abort("Lines this big not supported", 49);
|
||||
+
|
||||
dy = y2 - y1;
|
||||
|
||||
/*
|
||||
Index: t1lib-5.1.2/lib/type1/objects.c
|
||||
===================================================================
|
||||
--- t1lib-5.1.2.orig/lib/type1/objects.c 2007-12-23 09:49:42.000000000 -0600
|
||||
+++ t1lib-5.1.2/lib/type1/objects.c 2012-01-17 14:15:08.000000000 -0600
|
||||
@@ -1137,12 +1137,13 @@
|
||||
"Context: out of them", /* 46 */
|
||||
"MatrixInvert: can't", /* 47 */
|
||||
"xiStub called", /* 48 */
|
||||
- "Illegal access type1 abort() message" /* 49 */
|
||||
+ "Lines this big not supported", /* 49 */
|
||||
+ "Illegal access type1 abort() message" /* 50 */
|
||||
};
|
||||
|
||||
- /* no is valid from 1 to 48 */
|
||||
- if ( (number<1)||(number>48))
|
||||
- number=49;
|
||||
+ /* no is valid from 1 to 49 */
|
||||
+ if ( (number<1)||(number>49))
|
||||
+ number=50;
|
||||
return( err_msgs[number-1]);
|
||||
|
||||
}
|
||||
Index: t1lib-5.1.2/lib/type1/type1.c
|
||||
===================================================================
|
||||
--- t1lib-5.1.2.orig/lib/type1/type1.c 2012-01-17 14:13:28.000000000 -0600
|
||||
+++ t1lib-5.1.2/lib/type1/type1.c 2012-01-17 14:19:54.000000000 -0600
|
||||
@@ -1012,6 +1012,7 @@
|
||||
double nextdtana = 0.0; /* tangent of post-delta against horizontal line */
|
||||
double nextdtanb = 0.0; /* tangent of post-delta against vertical line */
|
||||
|
||||
+ if (ppoints == NULL || numppoints < 1) Error0v("FindStems: No previous point!\n");
|
||||
|
||||
/* setup default hinted position */
|
||||
ppoints[numppoints-1].ax = ppoints[numppoints-1].x;
|
||||
@@ -1289,7 +1290,7 @@
|
||||
static int DoRead(CodeP)
|
||||
int *CodeP;
|
||||
{
|
||||
- if (strindex >= CharStringP->len) return(FALSE); /* end of string */
|
||||
+ if (!CharStringP || strindex >= CharStringP->len) return(FALSE); /* end of string */
|
||||
/* We handle the non-documented Adobe convention to use lenIV=-1 to
|
||||
suppress charstring encryption. */
|
||||
if (blues->lenIV==-1) {
|
||||
@@ -1700,7 +1701,7 @@
|
||||
long pindex = 0;
|
||||
|
||||
/* compute hinting for previous segment! */
|
||||
- if (ppoints == NULL) Error0i("RLineTo: No previous point!\n");
|
||||
+ if (ppoints == NULL || numppoints < 2) Error0i("RLineTo: No previous point!\n");
|
||||
FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx, dy);
|
||||
|
||||
/* Allocate a new path point and pre-setup data */
|
||||
@@ -1729,7 +1730,7 @@
|
||||
long pindex = 0;
|
||||
|
||||
/* compute hinting for previous point! */
|
||||
- if (ppoints == NULL) Error0i("RRCurveTo: No previous point!\n");
|
||||
+ if (ppoints == NULL || numppoints < 2) Error0i("RRCurveTo: No previous point!\n");
|
||||
FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx1, dy1);
|
||||
|
||||
/* Allocate three new path points and pre-setup data */
|
||||
@@ -1788,7 +1789,9 @@
|
||||
long tmpind;
|
||||
double deltax = 0.0;
|
||||
double deltay = 0.0;
|
||||
-
|
||||
+
|
||||
+ if (ppoints == NULL || numppoints < 1) Error0i("DoClosePath: No previous point!");
|
||||
+
|
||||
/* If this ClosePath command together with the starting point of this
|
||||
path completes to a segment aligned to a stem, we would miss
|
||||
hinting for this point. --> Check and explicitly care for this! */
|
||||
@@ -1803,6 +1806,7 @@
|
||||
deltax = ppoints[i].x - ppoints[numppoints-1].x;
|
||||
deltay = ppoints[i].y - ppoints[numppoints-1].y;
|
||||
|
||||
+ if (ppoints == NULL || numppoints <= i + 1) Error0i("DoClosePath: No previous point!");
|
||||
/* save nummppoints and reset to move point */
|
||||
tmpind = numppoints;
|
||||
numppoints = i + 1;
|
||||
@@ -1905,7 +1909,7 @@
|
||||
FindStems( currx, curry, 0, 0, dx, dy);
|
||||
}
|
||||
else {
|
||||
- if (ppoints == NULL) Error0i("RMoveTo: No previous point!\n");
|
||||
+ if (ppoints == NULL || numppoints < 2) Error0i("RMoveTo: No previous point!\n");
|
||||
FindStems( currx, curry, ppoints[numppoints-2].x, ppoints[numppoints-2].y, dx, dy);
|
||||
}
|
||||
|
||||
@@ -2155,6 +2159,7 @@
|
||||
DOUBLE cx, cy;
|
||||
DOUBLE ex, ey;
|
||||
|
||||
+ if (ppoints == NULL || numppoints < 8) Error0v("FlxProc: No previous point!");
|
||||
|
||||
/* Our PPOINT list now contains 7 moveto commands which
|
||||
are about to be consumed by the Flex mechanism. --> Remove these
|
||||
@@ -2324,6 +2329,7 @@
|
||||
/* Returns currentpoint on stack */
|
||||
static void FlxProc2()
|
||||
{
|
||||
+ if (ppoints == NULL || numppoints < 1) Error0v("FlxProc2: No previous point!");
|
||||
/* Push CurrentPoint on fake PostScript stack */
|
||||
PSFakePush( ppoints[numppoints-1].x);
|
||||
PSFakePush( ppoints[numppoints-1].y);
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue