Merge branch 'master' into core-updates
This commit is contained in:
Ludovic Courtès
commit
e82e55e58c
|
|
@ -23,6 +23,7 @@
|
||||||
(eval . (put 'lambda* 'scheme-indent-function 1))
|
(eval . (put 'lambda* 'scheme-indent-function 1))
|
||||||
(eval . (put 'substitute* 'scheme-indent-function 1))
|
(eval . (put 'substitute* 'scheme-indent-function 1))
|
||||||
(eval . (put 'modify-phases 'scheme-indent-function 1))
|
(eval . (put 'modify-phases 'scheme-indent-function 1))
|
||||||
|
(eval . (put 'modify-services 'scheme-indent-function 1))
|
||||||
(eval . (put 'with-directory-excursion 'scheme-indent-function 1))
|
(eval . (put 'with-directory-excursion 'scheme-indent-function 1))
|
||||||
(eval . (put 'package 'scheme-indent-function 0))
|
(eval . (put 'package 'scheme-indent-function 0))
|
||||||
(eval . (put 'origin 'scheme-indent-function 0))
|
(eval . (put 'origin 'scheme-indent-function 0))
|
||||||
|
|
|
||||||
|
|
@ -125,6 +125,7 @@ GTAGS
|
||||||
/doc/os-config-desktop.texi
|
/doc/os-config-desktop.texi
|
||||||
/doc/*.1
|
/doc/*.1
|
||||||
/etc/guix-daemon.service
|
/etc/guix-daemon.service
|
||||||
|
/etc/guix-daemon.conf
|
||||||
/doc/images/bootstrap-graph.pdf
|
/doc/images/bootstrap-graph.pdf
|
||||||
/doc/images/coreutils-bag-graph.png
|
/doc/images/coreutils-bag-graph.png
|
||||||
/doc/images/coreutils-graph.png
|
/doc/images/coreutils-graph.png
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,48 @@
|
||||||
|
Contributor Code of Conduct
|
||||||
|
|
||||||
|
As contributors and maintainers of this project, and in the interest of
|
||||||
|
fostering an open and welcoming community, we pledge to respect all
|
||||||
|
people who contribute through reporting issues, posting feature
|
||||||
|
requests, updating documentation, submitting pull requests or patches,
|
||||||
|
and other activities.
|
||||||
|
|
||||||
|
We are committed to making participation in this project a
|
||||||
|
harassment-free experience for everyone, regardless of level of
|
||||||
|
experience, gender, gender identity and expression, sexual orientation,
|
||||||
|
disability, personal appearance, body size, race, ethnicity, age,
|
||||||
|
religion, or nationality.
|
||||||
|
|
||||||
|
Examples of unacceptable behavior by participants include:
|
||||||
|
|
||||||
|
* The use of sexualized language or imagery
|
||||||
|
* Personal attacks
|
||||||
|
* Trolling or insulting/derogatory comments
|
||||||
|
* Public or private harassment
|
||||||
|
* Publishing other's private information, such as physical or electronic
|
||||||
|
addresses, without explicit permission
|
||||||
|
* Other unethical or unprofessional conduct
|
||||||
|
|
||||||
|
Project maintainers have the right and responsibility to remove, edit,
|
||||||
|
or reject comments, commits, code, wiki edits, issues, and other
|
||||||
|
contributions that are not aligned to this Code of Conduct, or to ban
|
||||||
|
temporarily or permanently any contributor for other behaviors that they
|
||||||
|
deem inappropriate, threatening, offensive, or harmful.
|
||||||
|
|
||||||
|
By adopting this Code of Conduct, project maintainers commit themselves
|
||||||
|
to fairly and consistently applying these principles to every aspect of
|
||||||
|
managing this project. Project maintainers who do not follow or enforce
|
||||||
|
the Code of Conduct may be permanently removed from the project team.
|
||||||
|
|
||||||
|
This Code of Conduct applies both within project spaces and in public
|
||||||
|
spaces when an individual is representing the project or its community.
|
||||||
|
|
||||||
|
Instances of abusive, harassing, or otherwise unacceptable behavior may
|
||||||
|
be reported by contacting a project maintainer at guix-maintainers@gnu.org.
|
||||||
|
All complaints will be reviewed and investigated and will
|
||||||
|
result in a response that is deemed necessary and appropriate to the
|
||||||
|
circumstances. Maintainers are obligated to maintain confidentiality
|
||||||
|
with regard to the reporter of an incident.
|
||||||
|
|
||||||
|
This Code of Conduct is adapted from the Contributor Covenant
|
||||||
|
(http://contributor-covenant.org), version 1.3.0, available at
|
||||||
|
http://contributor-covenant.org/version/1/3/0/
|
||||||
16
Makefile.am
16
Makefile.am
|
|
@ -50,6 +50,8 @@ MODULES = \
|
||||||
guix/gnu-maintenance.scm \
|
guix/gnu-maintenance.scm \
|
||||||
guix/upstream.scm \
|
guix/upstream.scm \
|
||||||
guix/licenses.scm \
|
guix/licenses.scm \
|
||||||
|
guix/graph.scm \
|
||||||
|
guix/cve.scm \
|
||||||
guix/build-system.scm \
|
guix/build-system.scm \
|
||||||
guix/build-system/cmake.scm \
|
guix/build-system/cmake.scm \
|
||||||
guix/build-system/emacs.scm \
|
guix/build-system/emacs.scm \
|
||||||
|
|
@ -128,6 +130,8 @@ MODULES = \
|
||||||
guix/scripts/edit.scm \
|
guix/scripts/edit.scm \
|
||||||
guix/scripts/size.scm \
|
guix/scripts/size.scm \
|
||||||
guix/scripts/graph.scm \
|
guix/scripts/graph.scm \
|
||||||
|
guix/scripts/container.scm \
|
||||||
|
guix/scripts/container/exec.scm \
|
||||||
guix.scm \
|
guix.scm \
|
||||||
$(GNU_SYSTEM_MODULES)
|
$(GNU_SYSTEM_MODULES)
|
||||||
|
|
||||||
|
|
@ -195,6 +199,7 @@ SCM_TESTS = \
|
||||||
tests/pk-crypto.scm \
|
tests/pk-crypto.scm \
|
||||||
tests/pki.scm \
|
tests/pki.scm \
|
||||||
tests/sets.scm \
|
tests/sets.scm \
|
||||||
|
tests/gnu-maintenance.scm \
|
||||||
tests/substitute.scm \
|
tests/substitute.scm \
|
||||||
tests/builders.scm \
|
tests/builders.scm \
|
||||||
tests/derivations.scm \
|
tests/derivations.scm \
|
||||||
|
|
@ -221,6 +226,7 @@ SCM_TESTS = \
|
||||||
tests/size.scm \
|
tests/size.scm \
|
||||||
tests/graph.scm \
|
tests/graph.scm \
|
||||||
tests/challenge.scm \
|
tests/challenge.scm \
|
||||||
|
tests/cve.scm \
|
||||||
tests/file-systems.scm \
|
tests/file-systems.scm \
|
||||||
tests/services.scm \
|
tests/services.scm \
|
||||||
tests/containers.scm
|
tests/containers.scm
|
||||||
|
|
@ -253,6 +259,7 @@ SH_TESTS = \
|
||||||
tests/guix-archive.sh \
|
tests/guix-archive.sh \
|
||||||
tests/guix-authenticate.sh \
|
tests/guix-authenticate.sh \
|
||||||
tests/guix-environment.sh \
|
tests/guix-environment.sh \
|
||||||
|
tests/guix-environment-container.sh \
|
||||||
tests/guix-graph.sh \
|
tests/guix-graph.sh \
|
||||||
tests/guix-lint.sh
|
tests/guix-lint.sh
|
||||||
|
|
||||||
|
|
@ -292,6 +299,7 @@ EXTRA_DIST = \
|
||||||
HACKING \
|
HACKING \
|
||||||
ROADMAP \
|
ROADMAP \
|
||||||
TODO \
|
TODO \
|
||||||
|
CODE-OF-CONDUCT \
|
||||||
.dir-locals.el \
|
.dir-locals.el \
|
||||||
build-aux/build-self.scm \
|
build-aux/build-self.scm \
|
||||||
build-aux/hydra/gnu-system.scm \
|
build-aux/hydra/gnu-system.scm \
|
||||||
|
|
@ -308,6 +316,7 @@ EXTRA_DIST = \
|
||||||
tests/test.drv \
|
tests/test.drv \
|
||||||
tests/signing-key.pub \
|
tests/signing-key.pub \
|
||||||
tests/signing-key.sec \
|
tests/signing-key.sec \
|
||||||
|
tests/cve-sample.xml \
|
||||||
build-aux/config.rpath \
|
build-aux/config.rpath \
|
||||||
bootstrap \
|
bootstrap \
|
||||||
release.nix \
|
release.nix \
|
||||||
|
|
@ -336,6 +345,10 @@ AM_V_GUILEC = $(AM_V_GUILEC_$(V))
|
||||||
AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY))
|
AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY))
|
||||||
AM_V_GUILEC_0 = @echo " GUILEC" $@;
|
AM_V_GUILEC_0 = @echo " GUILEC" $@;
|
||||||
|
|
||||||
|
# Flags passed to 'guild compile'.
|
||||||
|
GUILD_COMPILE_FLAGS = \
|
||||||
|
-Wformat -Wunbound-variable -Warity-mismatch
|
||||||
|
|
||||||
# Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling. Otherwise, if
|
# Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling. Otherwise, if
|
||||||
# $GUILE_LOAD_COMPILED_PATH contains $(moduledir), we may find .go files in
|
# $GUILE_LOAD_COMPILED_PATH contains $(moduledir), we may find .go files in
|
||||||
# there that are newer than the local .scm files (for instance because the
|
# there that are newer than the local .scm files (for instance because the
|
||||||
|
|
@ -351,8 +364,7 @@ AM_V_GUILEC_0 = @echo " GUILEC" $@;
|
||||||
LC_ALL=C \
|
LC_ALL=C \
|
||||||
$(top_builddir)/pre-inst-env \
|
$(top_builddir)/pre-inst-env \
|
||||||
$(GUILD) compile -L "$(top_builddir)" -L "$(top_srcdir)" \
|
$(GUILD) compile -L "$(top_builddir)" -L "$(top_srcdir)" \
|
||||||
-Wformat -Wunbound-variable -Warity-mismatch \
|
$(GUILD_COMPILE_FLAGS) --target="$(host)" \
|
||||||
--target="$(host)" \
|
|
||||||
-o "$@" "$<"
|
-o "$@" "$<"
|
||||||
|
|
||||||
SUFFIXES = .go
|
SUFFIXES = .go
|
||||||
|
|
|
||||||
259
NEWS
259
NEWS
|
|
@ -10,6 +10,265 @@ Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||||
|
|
||||||
Please send Guix bug reports to bug-guix@gnu.org.
|
Please send Guix bug reports to bug-guix@gnu.org.
|
||||||
|
|
||||||
|
* Changes in 0.9.0 (since 0.8.3)
|
||||||
|
|
||||||
|
** Package management
|
||||||
|
|
||||||
|
*** New ‘guix graph’ command, to draw package graphs
|
||||||
|
*** New ‘guix challenge’ command, to challenge the authenticity of binaries
|
||||||
|
*** ‘guix environment’ has a new ‘--container’ option
|
||||||
|
*** ‘guix substitute’ now honors all the specified substitute URLs
|
||||||
|
*** New ‘guix import cran’ command, to import R packages from CRAN
|
||||||
|
*** Package descriptions can now include Texinfo markup rendered on the fly
|
||||||
|
*** ‘guix package’ has a new ‘--install-from-file’ option
|
||||||
|
*** ‘guix package --search’ shows package outputs
|
||||||
|
*** ‘guix refresh’ can refresh selected non-GNU package definitions
|
||||||
|
*** The ‘--ad-hoc’ option of ‘guix environment’ is now positional
|
||||||
|
*** The ‘--exec’ option of ‘guix environment’ is deprecated; use ‘--’ instead
|
||||||
|
*** ‘guix build’ has a new ‘--file’ option
|
||||||
|
*** ‘guix build --log-file’ can now return URLs
|
||||||
|
*** ‘guix size’ now has a ‘--substitute-urls’ option and is much faster
|
||||||
|
*** New ‘guix lint’ checkers: ‘formatting’, ‘license’, ‘source-file-name’
|
||||||
|
*** Download progress report has been improved
|
||||||
|
*** Emacs shell-mode completions for ‘guix’ commands updated
|
||||||
|
*** Emacs: New ‘M-x guix’ popup interface
|
||||||
|
*** Emacs: modes for viewing build logs (‘guix-build-log-mode’)
|
||||||
|
|
||||||
|
** Distribution
|
||||||
|
|
||||||
|
*** New extensible service composition API
|
||||||
|
|
||||||
|
The operating system service API in (gnu services) has been completely
|
||||||
|
rewritten, significantly improving extensibility and modularity, while
|
||||||
|
providing a framework that makes it easy to reason about service composition.
|
||||||
|
Consequently, several sources of redundancy and confusion in
|
||||||
|
‘operating-system’ declarations have been eliminated. See “Service
|
||||||
|
Composition” in the manual.
|
||||||
|
|
||||||
|
*** New ‘extension-graph’ and ‘dmd-graph’ sub-commands for ‘guix system’
|
||||||
|
*** New ‘container’ sub-command for ‘guix system’
|
||||||
|
*** New ‘guix container’ command, to deal with GuixSD containers
|
||||||
|
*** New ‘list-generations’ sub-command for ‘guix system’
|
||||||
|
*** ‘operating-system’ has a new ‘locale-libcs’ field
|
||||||
|
*** New services: ‘nginx-service’, ‘udisks-service’, ‘guix-publish-service’
|
||||||
|
*** ‘%desktop-services’ now includes Polkit, GeoClue, elogind, UDisks, and more
|
||||||
|
*** ‘dbus-daemon’ now has proper support for lazy service activation
|
||||||
|
*** ‘wicd-service’ automatically adds Wicd to the system profile
|
||||||
|
*** ‘slim-service’ automatically adds xterm to the system profile
|
||||||
|
*** hydra.gnu.org now provides substitutes for ‘armhf-linux’
|
||||||
|
*** /run/systemd is mounted as tmpfs by default, for use by elogind
|
||||||
|
*** ‘glibc’ package no longer contains Bash in its bin/ directory
|
||||||
|
*** libc now looks for locale data in a versioned sub-directory
|
||||||
|
*** libc honors the new ‘GUIX_LOCPATH’ environment variable
|
||||||
|
*** Xfce now defaults to the GNOME icon theme
|
||||||
|
*** 543 new packages
|
||||||
|
|
||||||
|
abduco, accountsservice, american-fuzzy-lop, ansible, arandr, attic,
|
||||||
|
autobuild, bash-minimal, bash-static, bio-blastxmlparser, bio-locus,
|
||||||
|
bioperl-minimal, bioruby, bitcoin-core, bspwm, byobu, cabal-install, cityhash,
|
||||||
|
clang-runtime, clang-runtime, cm, cmus, conky, coreutils-minimal, cpphs,
|
||||||
|
cvs-fast-export, d-feet, deeptools, diffoscope, dosbox, dvtm, emacs-butler,
|
||||||
|
emacs-dash, emacs-debbugs, emacs-deferred, emacs-f, emacs-flycheck,
|
||||||
|
emacs-let-alist, emacs-ob-ipython, emacs-s, emacs-typo, enblend-enfuse,
|
||||||
|
epiphany, esmtp, ethtool, evilwm, exfat-utils, express-beta-diversity,
|
||||||
|
extra-cmake-modules, extundelete, fastcap, fasthenry, figlet, file-roller,
|
||||||
|
flann, font-anonymous-pro, font-gnu-unifont, font-inconsolata, font-tex-gyre,
|
||||||
|
font-ubuntu, frescobaldi, fuse-exfat, gajim, gamine, gerbv, gexiv2,
|
||||||
|
ghc-adjunctions, ghc-aeson, ghc-alex, ghc-annotated-wl-pprint,
|
||||||
|
ghc-ansi-terminal, ghc-ansi-wl-pprint, ghc-appar, ghc-async, ghc-attoparsec,
|
||||||
|
ghc-auto-update, ghc-base-compat, ghc-base-orphans, ghc-base64-bytestring,
|
||||||
|
ghc-bifunctors, ghc-blaze-builder, ghc-blaze-html, ghc-blaze-markup,
|
||||||
|
ghc-byteorder, ghc-bytestring-builder, ghc-cereal, ghc-cgi, ghc-charset,
|
||||||
|
ghc-cheapskate, ghc-clock, ghc-cmdargs, ghc-comonad, ghc-contravariant,
|
||||||
|
ghc-cookie, ghc-css-text, ghc-data-default, ghc-data-default-class,
|
||||||
|
ghc-data-default-instances-base, ghc-data-default-instances-containers,
|
||||||
|
ghc-data-default-instances-dlist, ghc-data-default-instances-old-locale,
|
||||||
|
ghc-digest, ghc-distributive, ghc-dlist, ghc-doctest, ghc-easy-file,
|
||||||
|
ghc-exceptions, ghc-extensible-exceptions, ghc-extra, ghc-fast-logger,
|
||||||
|
ghc-fingertree, ghc-free, ghc-generic-deriving, ghc-gluraw, ghc-glut,
|
||||||
|
ghc-haddock, ghc-haddock-api, ghc-haddock-library, ghc-half, ghc-happy,
|
||||||
|
ghc-haskell-src, ghc-haskell-src-exts, ghc-hspec, ghc-hspec-core,
|
||||||
|
ghc-hspec-expectations, ghc-hspec-meta, ghc-html, ghc-http-types, ghc-iproute,
|
||||||
|
ghc-kan-extensions, ghc-lens, ghc-lifted-base, ghc-logict, ghc-mmorph,
|
||||||
|
ghc-monad-control, ghc-multipart, ghc-nats, ghc-objectname, ghc-old-locale,
|
||||||
|
ghc-old-time, ghc-opengl, ghc-openglraw, ghc-optparse-applicative,
|
||||||
|
ghc-parsers, ghc-pcre-light, ghc-polyparse, ghc-prelude-extras,
|
||||||
|
ghc-profunctors, ghc-quickcheck-instances, ghc-quickcheck-io,
|
||||||
|
ghc-quickcheck-unicode, ghc-reducers, ghc-reflection, ghc-regex-base,
|
||||||
|
ghc-regex-compat, ghc-regex-posix, ghc-regex-tdfa-rc, ghc-resourcet, ghc-safe,
|
||||||
|
ghc-scientific, ghc-sdl, ghc-sdl-image, ghc-sdl-mixer, ghc-semigroupoids,
|
||||||
|
ghc-semigroups, ghc-setenv, ghc-silently, ghc-simple-reflect, ghc-smallcheck,
|
||||||
|
ghc-statevar, ghc-streaming-commons, ghc-stringbuilder, ghc-stringsearch,
|
||||||
|
ghc-tagged, ghc-tagsoup, ghc-tasty, ghc-tasty-ant-xml, ghc-tasty-golden,
|
||||||
|
ghc-tasty-hunit, ghc-tasty-quickcheck, ghc-tasty-smallcheck, ghc-temporary,
|
||||||
|
ghc-temporary-rc, ghc-transformers-base, ghc-transformers-compat,
|
||||||
|
ghc-trifecta, ghc-unbounded-delays, ghc-uniplate, ghc-unix-compat,
|
||||||
|
ghc-unix-time, ghc-utf8-string, ghc-vault, ghc-vector-binary-instances,
|
||||||
|
ghc-void, ghc-wai, ghc-wai-extra, ghc-wai-logger, ghc-word8, ghc-x11,
|
||||||
|
ghc-x11-xft, ghc-xhtml, ghc-xml, ghc-xmonad-contrib, ghc-xss-sanitize,
|
||||||
|
ghc-zip-archive, glibc-hurd, glibc-hurd-headers, gmtp, graphios, gtk-doc,
|
||||||
|
guile-next, guile-present, guile-redis, guile-rsvg, guile-wisp, gusb, gvfs,
|
||||||
|
gzochi, haunt, hlint, hscolour, hspec-discover, hurd-minimal, i3-wm, i3status,
|
||||||
|
ibus-libpinyin, idris, ifstatus, keepassx, klick, kwindowsystem, lablgtk,
|
||||||
|
libatasmart, libchamplain, libchop, libconfuse, libcue, libesmtp, libev,
|
||||||
|
libfm, libfm-extra, libgee, libgudev, liblxqt, libndp, libpano13, libpinyin,
|
||||||
|
libraw, libusb-compat, libyajl, lxqt-common, lxqt-session, lxrandr, lxtask,
|
||||||
|
lxterminal, lz4, mafft, manaplus, mars, menu-cache, minixml, mosaik,
|
||||||
|
nestopia-ue, newt, non-sequencer, ntk, openimageio, opusfile, patches, pbzip2,
|
||||||
|
pcmanfm, pcre2, pd, pelican, perl-czplib, perl-date-manip, perl-finance-quote,
|
||||||
|
perl-html-element-extended, perl-html-tableextract, perl-pod-simple, physfs,
|
||||||
|
pidgin, pidgin-otr, pigz, po4a, poppler-qt4, pwgen, python-appdirs,
|
||||||
|
python-bandit, python-blinker, python-ccm, python-chardet,
|
||||||
|
python-cryptography, python-cryptography-vectors, python-debian,
|
||||||
|
python-debtcollector, python-ecdsa, python-file, python-fonttools,
|
||||||
|
python-gnupg, python-hacking, python-httplib2, python-idna,
|
||||||
|
python-ipython-genutils, python-iso8601, python-joblib, python-libarchive-c,
|
||||||
|
python-llfuse, python-ly, python-minimal, python-minimal, python-mistune,
|
||||||
|
python-monotonic, python-mox3, python-msgpack, python-nbxmpp, python-netaddr,
|
||||||
|
python-numexpr, python-os-client-config, python-os-testr, python-oslo.config,
|
||||||
|
python-oslo.context, python-oslo.i18n, python-oslo.log,
|
||||||
|
python-oslo.serialization, python-oslo.utils, python-oslosphinx,
|
||||||
|
python-oslotest, python-paramiko, python-passlib, python-pathpy, python-patsy,
|
||||||
|
python-pbr, python-pbr, python-pexpect, python-pickleshare, python-pip,
|
||||||
|
python-poppler-qt4, python-pretend, python-prettytable, python-ptyprocess,
|
||||||
|
python-py-bcrypt, python-pyasn1, python-pyopenssl, python-pytest-runner,
|
||||||
|
python-requests-mock, python-setuptools-scm, python-simplegeneric,
|
||||||
|
python-statsmodels, python-stevedore, python-tempest-lib, python-terminado,
|
||||||
|
python-tlsh, python-traitlets, python-webob, python-wrapt, python-xlrd,
|
||||||
|
python2-appdirs, python2-bandit, python2-blinker, python2-ccm,
|
||||||
|
python2-chardet, python2-cryptography, python2-cryptography-vectors,
|
||||||
|
python2-debian, python2-debtcollector, python2-ecdsa, python2-file,
|
||||||
|
python2-fonttools, python2-gnupg, python2-hacking, python2-httplib2,
|
||||||
|
python2-idna, python2-ipaddress, python2-ipython-genutils, python2-iso8601,
|
||||||
|
python2-joblib, python2-keyring, python2-libarchive-c, python2-llfuse,
|
||||||
|
python2-mistune, python2-monotonic, python2-mox3, python2-msgpack,
|
||||||
|
python2-nbxmpp, python2-netaddr, python2-notmuch, python2-numexpr,
|
||||||
|
python2-os-client-config, python2-os-testr, python2-oslo.config,
|
||||||
|
python2-oslo.context, python2-oslo.i18n, python2-oslo.log,
|
||||||
|
python2-oslo.serialization, python2-oslo.utils, python2-oslosphinx,
|
||||||
|
python2-oslotest, python2-paramiko, python2-passlib, python2-pathpy,
|
||||||
|
python2-patsy, python2-pbr, python2-pbr, python2-pexpect, python2-pickleshare,
|
||||||
|
python2-pip, python2-pretend, python2-prettytable, python2-ptyprocess,
|
||||||
|
python2-py-bcrypt, python2-pyasn1, python2-pycrypto, python2-pyopenssl,
|
||||||
|
python2-pytest-runner, python2-requests-mock, python2-setuptools-scm,
|
||||||
|
python2-simplegeneric, python2-statsmodels, python2-stevedore,
|
||||||
|
python2-tempest-lib, python2-terminado, python2-tlsh, python2-traitlets,
|
||||||
|
python2-webob, python2-wrapt, python2-xlrd, r-assertthat, r-bh, r-chron,
|
||||||
|
r-codetools, r-colorspace, r-crayon, r-data.table, r-dbi, r-dichromat,
|
||||||
|
r-digest, r-dplyr, r-evaluate, r-formatr, r-ggplot2, r-gtable, r-highr,
|
||||||
|
r-htmltools, r-htmlwidgets, r-httpuv, r-jsonlite, r-knitr, r-labeling,
|
||||||
|
r-lazyeval, r-magrittr, r-markdown, r-memoise, r-microbenchmark, r-mime,
|
||||||
|
r-munsell, r-plyr, r-proto, r-pryr, r-qtl, r-r6, r-rcolorbrewer, r-rcpp,
|
||||||
|
r-reshape2, r-scales, r-servr, r-stringi, r-stringr, r-testthat, r-yaml, rage,
|
||||||
|
raincat, redis, rest, rfkill, rpm, ruby-activesupport, ruby-atoulme-antwrap,
|
||||||
|
ruby-bio-logger, ruby-builder, ruby-byebug, ruby-coderay, ruby-cucumber-core,
|
||||||
|
ruby-diff-lcs, ruby-docile, ruby-ffi, ruby-formatador, ruby-gherkin3,
|
||||||
|
ruby-json, ruby-libxml, ruby-listen, ruby-log4r, ruby-lumberjack,
|
||||||
|
ruby-method-source, ruby-mini-portile, ruby-minitar, ruby-nenv, ruby-nokogiri,
|
||||||
|
ruby-notiffany, ruby-orderedhash, ruby-ox, ruby-permutation, ruby-pg,
|
||||||
|
ruby-pry, ruby-rack, ruby-rb-inotify, ruby-rjb, ruby-rubygems-tasks,
|
||||||
|
ruby-shellany, ruby-shindo, ruby-simplecov-html, ruby-thor, ruby-thread-safe,
|
||||||
|
ruby-tzinfo, ruby-xml-simple, ruby-yard, sassc, scmutils, seqmagick, shotwell,
|
||||||
|
shroud, simple-scan, squashfs-tools, sxhkd, tinc, udisks, unison, vsearch,
|
||||||
|
webkitgtk-gtk2, wesnoth, wpa-supplicant-minimal, xcb-util-cursor, xcompmgr,
|
||||||
|
xfce4-pulseaudio-plugin, xjackfreak, xlsfonts, xmonad, yapet, yelp,
|
||||||
|
yelp-tools, yelp-xsl, znc, zynaddsubfx
|
||||||
|
|
||||||
|
*** 268 package updates
|
||||||
|
|
||||||
|
abcde-2.7, arb-2.7.0, ardour-4.2, at-spi2-atk-2.18.1, at-spi2-core-2.18.1,
|
||||||
|
ath9k-htc-firmware-1.4.0, atk-2.18.0, atkmm-2.24.1, autogen-5.18.6,
|
||||||
|
avidemux-2.6.10, bedtools-2.24.0, binutils-2.25.1,
|
||||||
|
binutils-static-stripped-tarball-2.25.1, bison-3.0.4, bluez-5.35,
|
||||||
|
bundler-1.10.6, c-reduce-2.3.0, cairomm-1.12.0, calcurse-4.0.0,
|
||||||
|
calibre-2.41.0, camlp5-6.14, cgal-4.6.3, chess-6.2.2, clang-3.6.2,
|
||||||
|
claws-mail-3.13.0, cmake-3.3.2, complexity-1.3, conkeror-1.0pre1.20150730,
|
||||||
|
cpio-2.12, crossmap-0.2.1, csound-6.05, cups-2.1.0, cups-filters-1.0.75,
|
||||||
|
cups-minimal-2.1.0, curl-7.45.0, dbus-1.10.0, dbus-1.10.0.a, ddrescue-1.20,
|
||||||
|
dmd-0.2.01, docbook-xml-4.4, docbook-xml-4.5, dosfstools-3.0.28,
|
||||||
|
e2fsck-static-1.42.13, e2fsprogs-1.42.13, efl-1.15.2, eigen-3.2.6,
|
||||||
|
elementary-1.15.2, emotion-generic-players-1.15.0, enlightenment-0.19.12,
|
||||||
|
eudev-3.1.5, evas-generic-loaders-1.15.0, feh-2.14, ffmpeg-2.8, fish-2.2.0,
|
||||||
|
flint-2.5.2, fontconfig-2.11.94, freeglut-3.0.0, freeimage-3.17.0,
|
||||||
|
freeipmi-1.4.11, gcc-4.9.3, gcc-4.9.3, gcc-4.9.3, gcc-5.2.0,
|
||||||
|
gcc-toolchain-5.2.0, gcj-4.9.3, gdb-7.10, gdk-pixbuf-2.32.1, geiser-0.8.1,
|
||||||
|
gettext-0.19.6, ghc-7.10.2, ghc-hashable-1.2.3.3, ghc-http-4000.2.20,
|
||||||
|
ghc-mtl-2.2.1, ghc-network-2.6.2.1, ghc-network-uri-2.6.0.3,
|
||||||
|
ghc-primitive-0.6.1.0, ghc-quickcheck-2.8.1, ghc-syb-0.6, ghc-text-1.2.1.3,
|
||||||
|
ghc-vector-0.11.0.0, giflib-5.1.1, git-2.5.0, git-manpages-2.5.0,
|
||||||
|
git-modes-1.2.0, glib-2.46.1, glib-networking-2.46.1, glibc-2.22,
|
||||||
|
glibc-locales-2.22, glibc-stripped-tarball-2.22, glibc-utf8-locales-2.22,
|
||||||
|
glibmm-2.46.1, global-6.5.1, glpk-4.56, gnome-desktop-3.16.2,
|
||||||
|
gnome-themes-standard-3.16.2, gnu-pw-mgr-1.6, gnumach-headers-1.6,
|
||||||
|
gnupg-2.1.9, gnurl-7.45.0, gnutls-3.4.5, gobject-introspection-1.46.0,
|
||||||
|
gp2c-0.0.9pl3, graphite2-1.3.3, graphviz-2.38.0,
|
||||||
|
gsettings-desktop-schemas-3.18.0, gsl-2.0, gst-libav-1.6.1,
|
||||||
|
gst-plugins-base-1.6.1, gst-plugins-good-1.6.1, gst-plugins-ugly-1.6.1,
|
||||||
|
gstreamer-1.6.1, gtk+-3.18.2, gtkmm-3.18.0, guile-ssh-0.8.0, guitarix-0.33.0,
|
||||||
|
guix-0.8.3, guix-0.8.3.b485f75, harfbuzz-1.0.5, help2man-1.47.2,
|
||||||
|
hurd-headers-0.7, ibus-1.5.11, icecat-38.3.0-gnu1, icedtea6-1.13.8,
|
||||||
|
icedtea7-2.6.2, imagemagick-6.9.2-1, intltool-0.51.0, json-glib-1.0.4,
|
||||||
|
leptonica-1.72, less-481, libbluray-0.9.0, libcap-2.24, libdrm-2.4.65,
|
||||||
|
libdvdcss-1.3.99, libedit-20150325-3.1, libgcrypt-1.6.3, libgsf-1.14.34,
|
||||||
|
libidn-1.32, libinput-0.21.0, libmicrohttpd-0.9.45, libmtp-1.1.9,
|
||||||
|
libotr-4.1.0, libpcap-1.7.4, libpciaccess-0.13.4, libqtxdg-1.2.0,
|
||||||
|
librsvg-2.40.11, libsigc++-2.6.1, libsoup-2.52.1, libssh-0.6.5, libtiff-4.0.5,
|
||||||
|
libtorrent-0.13.6, libva-1.6.1, lilypond-2.19.27, links-2.12,
|
||||||
|
linux-libre-4.2.5, linux-pam-1.2.1, lirc-0.9.3, llvm-3.6.2, lua-5.2.3,
|
||||||
|
lzo-2.09, magit-2.3.0, mesa-11.0.3, mesa-headers-11.0.3, mig-1.6,
|
||||||
|
minetest-0.4.13, mosh-1.2.5, mpg123-1.22.4, mplayer-1.2, mpv-0.11.0,
|
||||||
|
mu-0.9.13, mutt-1.5.24, ncdu-1.11, ncmpcpp-0.6.7, ncurses-6.0, node-0.12.7,
|
||||||
|
notmuch-0.20.2, ntp-4.2.8p4, ocaml-4.02.3, offlineimap-6.5.7, openblas-0.2.15,
|
||||||
|
openjpeg-2.1.0, openldap-2.4.42, openssh-7.0p1, orc-0.4.24, pango-1.38.1,
|
||||||
|
pangomm-2.38.1, parallel-20151022, pavucontrol-3.0,
|
||||||
|
pbtranscript-tofu-2.2.3.8f5467fe6, pciutils-3.3.1, perf-4.2.5,
|
||||||
|
perl-xml-parser-2.44, pixman-0.32.8, poppler-0.37.0, powertop-2.7,
|
||||||
|
python-cffi-1.2.1, python-dateutil-2.2, python-fixtures-1.3.1,
|
||||||
|
python-ipython-3.2.1, python-pyflakes-0.9.2, python-pygobject-3.18.0,
|
||||||
|
python-pyqt-4.11.4, python-pyqt-5.5, python-requests-2.8.0,
|
||||||
|
python-scipy-0.16.0, python-setuptools-18.3.1, python-sip-4.16.9,
|
||||||
|
python-six-1.9.0, python2-cffi-1.2.1, python2-dateutil-2.2,
|
||||||
|
python2-fixtures-1.3.1, python2-ipython-3.2.1, python2-pygobject-3.18.0,
|
||||||
|
python2-pyqt-4.11.4, python2-pyqt-5.5, python2-requests-2.8.0,
|
||||||
|
python2-scipy-0.16.0, python2-setuptools-18.3.1, python2-sip-4.16.9,
|
||||||
|
python2-six-1.9.0, qemu-2.4.0.1, qemu-headless-2.4.0.1, qpdf-5.1.3,
|
||||||
|
qsynth-0.4.0, qt-5.5.1, r-3.2.2, racket-6.2.1, ratpoison-1.4.8, readline-6.3,
|
||||||
|
retroarch-1.2.2, ripperx-2.8.0, rtorrent-0.9.6, ruby-2.2.3, ruby-arel-6.0.3,
|
||||||
|
ruby-bacon-1.2.0, ruby-i18n-0.7.0, samtools-1.2, sfarklib-2.24, sfml-2.3.2,
|
||||||
|
shadow-4.2.1, sipwitch-1.9.14, sqlite-3.8.11.1, subversion-1.8.14,
|
||||||
|
synergy-1.7.4, tcl-8.6.4, tcpdump-4.7.4, teckit-2.5.4, terminology-0.9.1,
|
||||||
|
texlive-2015, texlive-bin-2015, texlive-texmf-2015, tiled-0.13.1, tk-8.6.4,
|
||||||
|
tmux-2.0, tor-0.2.6.10, ucommon-6.6.2, units-2.12, util-linux-2.27,
|
||||||
|
vala-0.30.0, valgrind-3.11.0, vlc-2.2.1, webkitgtk-2.8.5, weechat-1.3,
|
||||||
|
wine-1.7.52, wpa-supplicant-2.5, xapian-1.2.21, xterm-320,
|
||||||
|
youtube-dl-2015.11.01, zsh-5.1.1
|
||||||
|
|
||||||
|
** Programming interfaces
|
||||||
|
|
||||||
|
*** Rewritten (gnu services) module; (gnu services …) modules adjusted
|
||||||
|
*** New Emacs development tools, see “Development” in the manual
|
||||||
|
*** (guix gexp) provides the declarative ‘computed-file’, ‘program-file’, etc.
|
||||||
|
*** New (guix upstream) module, for generalized upstream release tracking
|
||||||
|
|
||||||
|
** Noteworthy bug fixes
|
||||||
|
|
||||||
|
*** Passwords in /etc/shadow are SHA512-hashed (http://bugs.gnu.org/21318)
|
||||||
|
*** daemon: Require a signature for imports made by root
|
||||||
|
(http://bugs.gnu.org/21354)
|
||||||
|
*** emacs: Fix guix-guile-program default value (http://bugs.gnu.org/21127)
|
||||||
|
*** Compressed initrds no longer include timestamps
|
||||||
|
*** Partly fix handling of encrypted root partitions
|
||||||
|
(http://bugs.gnu.org/19190)
|
||||||
|
*** Python now includes tkinter (http://bugs.gnu.org/20889)
|
||||||
|
*** Memoize the results of ‘package-with-python2’ (http://bugs.gnu.org/21675)
|
||||||
|
*** Use the daemon's substitute URLs by default (http://bugs.gnu.org/20217)
|
||||||
|
*** ‘guix system --no-grub’ works correctly for ‘init’ and ‘reconfigure’
|
||||||
|
(http://bugs.gnu.org/21068)
|
||||||
|
|
||||||
|
** Native language support
|
||||||
|
|
||||||
|
*** Updated translations: da
|
||||||
|
|
||||||
* Changes in 0.8.3 (since 0.8.2)
|
* Changes in 0.8.3 (since 0.8.2)
|
||||||
|
|
||||||
** Package management
|
** Package management
|
||||||
|
|
|
||||||
2
THANKS
2
THANKS
|
|
@ -25,6 +25,7 @@ infrastructure help:
|
||||||
Daniel Kochmański <dkochmanski@hellsgate.pl>
|
Daniel Kochmański <dkochmanski@hellsgate.pl>
|
||||||
Matthew Lien <bluet@bluet.org>
|
Matthew Lien <bluet@bluet.org>
|
||||||
Dave Love <fx@gnu.org>
|
Dave Love <fx@gnu.org>
|
||||||
|
Chris Marusich <cmmarusich@gmail.com>
|
||||||
Niels Möller <nisse@lysator.liu.se>
|
Niels Möller <nisse@lysator.liu.se>
|
||||||
Cyprien Nicolas <cyprien@nicolas.tf>
|
Cyprien Nicolas <cyprien@nicolas.tf>
|
||||||
Yutaka Niibe <gniibe@fsij.org>
|
Yutaka Niibe <gniibe@fsij.org>
|
||||||
|
|
@ -39,6 +40,7 @@ infrastructure help:
|
||||||
Thomas Schwinge <thomas@codesourcery.com>
|
Thomas Schwinge <thomas@codesourcery.com>
|
||||||
Alexander Shendi <Alexander.Shendi@web.de>
|
Alexander Shendi <Alexander.Shendi@web.de>
|
||||||
Alen Skondro <askondro@gmail.com>
|
Alen Skondro <askondro@gmail.com>
|
||||||
|
Jan Synáček <jan.synacek@gmail.com>
|
||||||
Matthias Wachs <wachs@net.in.tum.de>
|
Matthias Wachs <wachs@net.in.tum.de>
|
||||||
Christopher Allan Webber <cwebber@dustycloud.org>
|
Christopher Allan Webber <cwebber@dustycloud.org>
|
||||||
Philip Woods <elzairthesorcerer@gmail.com>
|
Philip Woods <elzairthesorcerer@gmail.com>
|
||||||
|
|
|
||||||
|
|
@ -14,14 +14,6 @@ if test "x$guix_build_daemon" = "xyes"; then
|
||||||
AC_PROG_RANLIB
|
AC_PROG_RANLIB
|
||||||
AC_CONFIG_HEADER([nix/config.h])
|
AC_CONFIG_HEADER([nix/config.h])
|
||||||
|
|
||||||
dnl Decompressors, for use by the substituter.
|
|
||||||
AC_PATH_PROG([GZIP], [gzip])
|
|
||||||
AC_PATH_PROG([BZIP2], [bzip2])
|
|
||||||
AC_PATH_PROG([XZ], [xz])
|
|
||||||
AC_SUBST([GZIP])
|
|
||||||
AC_SUBST([BZIP2])
|
|
||||||
AC_SUBST([XZ])
|
|
||||||
|
|
||||||
dnl Use 64-bit file system calls so that we can support files > 2 GiB.
|
dnl Use 64-bit file system calls so that we can support files > 2 GiB.
|
||||||
AC_SYS_LARGEFILE
|
AC_SYS_LARGEFILE
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -90,6 +90,14 @@ GUIX_CHECK_LIBC_MOUNT
|
||||||
AM_CONDITIONAL([BUILD_SYSCALLS_MODULE],
|
AM_CONDITIONAL([BUILD_SYSCALLS_MODULE],
|
||||||
[test "x$guix_cv_libc_has_mount" = "xyes"])
|
[test "x$guix_cv_libc_has_mount" = "xyes"])
|
||||||
|
|
||||||
|
dnl Decompressors, for use by the substituter and other modules.
|
||||||
|
AC_PATH_PROG([GZIP], [gzip])
|
||||||
|
AC_PATH_PROG([BZIP2], [bzip2])
|
||||||
|
AC_PATH_PROG([XZ], [xz])
|
||||||
|
AC_SUBST([GZIP])
|
||||||
|
AC_SUBST([BZIP2])
|
||||||
|
AC_SUBST([XZ])
|
||||||
|
|
||||||
AC_ARG_WITH([nix-prefix],
|
AC_ARG_WITH([nix-prefix],
|
||||||
[AS_HELP_STRING([--with-nix-prefix=DIR],
|
[AS_HELP_STRING([--with-nix-prefix=DIR],
|
||||||
[search for Nix in DIR (for testing purposes and '--disable-daemon' builds)])],
|
[search for Nix in DIR (for testing purposes and '--disable-daemon' builds)])],
|
||||||
|
|
|
||||||
19
daemon.am
19
daemon.am
|
|
@ -21,7 +21,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
BUILT_SOURCES += nix/libstore/schema.sql.hh
|
BUILT_SOURCES += nix/libstore/schema.sql.hh
|
||||||
CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service
|
CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service etc/guix-daemon.conf
|
||||||
|
|
||||||
noinst_LIBRARIES = libformat.a libutil.a libstore.a
|
noinst_LIBRARIES = libformat.a libutil.a libstore.a
|
||||||
|
|
||||||
|
|
@ -69,7 +69,8 @@ libutil_headers = \
|
||||||
nix/libutil/gcrypt-hash.hh \
|
nix/libutil/gcrypt-hash.hh \
|
||||||
nix/libutil/md5.h \
|
nix/libutil/md5.h \
|
||||||
nix/libutil/sha1.h \
|
nix/libutil/sha1.h \
|
||||||
nix/libutil/sha256.h
|
nix/libutil/sha256.h \
|
||||||
|
nix/libutil/sha512.h
|
||||||
|
|
||||||
libutil_a_CPPFLAGS = \
|
libutil_a_CPPFLAGS = \
|
||||||
-I$(top_builddir)/nix \
|
-I$(top_builddir)/nix \
|
||||||
|
|
@ -191,11 +192,23 @@ etc/guix-daemon.service: etc/guix-daemon.service.in \
|
||||||
"$(srcdir)/etc/guix-daemon.service.in" > "$@.tmp"
|
"$(srcdir)/etc/guix-daemon.service.in" > "$@.tmp"
|
||||||
mv "$@.tmp" "$@"
|
mv "$@.tmp" "$@"
|
||||||
|
|
||||||
|
# The '.conf' job for Upstart.
|
||||||
|
upstartjobdir = $(libdir)/upstart/system
|
||||||
|
nodist_upstartjob_DATA = etc/guix-daemon.conf
|
||||||
|
|
||||||
|
etc/guix-daemon.conf: etc/guix-daemon.conf.in \
|
||||||
|
$(top_builddir)/config.status
|
||||||
|
$(MKDIR_P) "`dirname "$@"`"
|
||||||
|
$(SED) -e 's|@''bindir''@|$(bindir)|' < \
|
||||||
|
"$(srcdir)/etc/guix-daemon.conf.in" > "$@.tmp"
|
||||||
|
mv "$@.tmp" "$@"
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
nix/libstore/schema.sql \
|
nix/libstore/schema.sql \
|
||||||
nix/AUTHORS \
|
nix/AUTHORS \
|
||||||
nix/COPYING \
|
nix/COPYING \
|
||||||
etc/guix-daemon.service.in
|
etc/guix-daemon.service.in \
|
||||||
|
etc/guix-daemon.conf.in
|
||||||
|
|
||||||
AM_TESTS_ENVIRONMENT += \
|
AM_TESTS_ENVIRONMENT += \
|
||||||
top_builddir="$(abs_top_builddir)"
|
top_builddir="$(abs_top_builddir)"
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,14 @@ grow! Please get in touch with us on @email{guix-devel@@gnu.org} and
|
||||||
reports, patches, and anything that may be helpful to the project. We
|
reports, patches, and anything that may be helpful to the project. We
|
||||||
particularly welcome help on packaging (@pxref{Packaging Guidelines}).
|
particularly welcome help on packaging (@pxref{Packaging Guidelines}).
|
||||||
|
|
||||||
|
@cindex code of conduct, of contributors
|
||||||
|
@cindex contributor covenant
|
||||||
|
We want to provide a warm, friendly, and harassment-free environment, so
|
||||||
|
that anyone can contribute to the best of their abilities. To this end
|
||||||
|
our project uses a ``Contributor Covenant'', which was adapted from
|
||||||
|
@url{http://contributor-covenant.org/}. You can find a local version in
|
||||||
|
the @file{CODE-OF-CONDUCT} file in the source tree.
|
||||||
|
|
||||||
@menu
|
@menu
|
||||||
* Building from Git:: The latest and greatest.
|
* Building from Git:: The latest and greatest.
|
||||||
* Running Guix Before It Is Installed:: Hacker tricks.
|
* Running Guix Before It Is Installed:: Hacker tricks.
|
||||||
|
|
@ -27,33 +35,47 @@ the installation instructions (@pxref{Requirements}).
|
||||||
@item @url{http://gnu.org/software/autoconf/, GNU Autoconf};
|
@item @url{http://gnu.org/software/autoconf/, GNU Autoconf};
|
||||||
@item @url{http://gnu.org/software/automake/, GNU Automake};
|
@item @url{http://gnu.org/software/automake/, GNU Automake};
|
||||||
@item @url{http://gnu.org/software/gettext/, GNU Gettext};
|
@item @url{http://gnu.org/software/gettext/, GNU Gettext};
|
||||||
|
@item @url{http://gnu.org/software/texinfo/, GNU Texinfo};
|
||||||
@item @url{http://www.graphviz.org/, Graphviz};
|
@item @url{http://www.graphviz.org/, Graphviz};
|
||||||
@item @url{http://www.gnu.org/software/help2man/, GNU Help2man (optional)}.
|
@item @url{http://www.gnu.org/software/help2man/, GNU Help2man (optional)}.
|
||||||
@end itemize
|
@end itemize
|
||||||
|
|
||||||
Run @command{./bootstrap} to download the Nix daemon source code and to
|
The easiest way to set up a development environment for Guix is, of
|
||||||
generate the build system infrastructure using autoconf. It reports an
|
course, by using Guix! The following command starts a new shell where
|
||||||
error if an inappropriate version of the above packages is being used.
|
all the dependencies and appropriate environment variables are set up to
|
||||||
|
hack on Guix:
|
||||||
|
|
||||||
@noindent
|
@example
|
||||||
If you get an error like this one:
|
guix environment guix
|
||||||
|
@end example
|
||||||
|
|
||||||
|
@xref{Invoking guix environment}, for more information on that command.
|
||||||
|
Extra dependencies can be added with @option{--ad-hoc}:
|
||||||
|
|
||||||
|
@example
|
||||||
|
guix environment guix --ad-hoc help2man git strace
|
||||||
|
@end example
|
||||||
|
|
||||||
|
Run @command{./bootstrap} to generate the build system infrastructure
|
||||||
|
using Autoconf and Automake. If you get an error like this one:
|
||||||
|
|
||||||
@example
|
@example
|
||||||
configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES
|
configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
|
@noindent
|
||||||
it probably means that Autoconf couldn’t find @file{pkg.m4}, which is
|
it probably means that Autoconf couldn’t find @file{pkg.m4}, which is
|
||||||
provided by @command{pkg-config}. Make sure that @file{pkg.m4} is
|
provided by pkg-config. Make sure that @file{pkg.m4} is available. The
|
||||||
available. For instance, if you installed Automake in
|
same holds for the @file{guile.m4} set of macros provided by Guile. For
|
||||||
@file{/usr/local}, it wouldn’t look for @file{.m4} files in
|
instance, if you installed Automake in @file{/usr/local}, it wouldn’t
|
||||||
@file{/usr/share}. So you have to invoke the following command in that
|
look for @file{.m4} files in @file{/usr/share}. In that case, you have
|
||||||
case
|
to invoke the following command:
|
||||||
|
|
||||||
@example
|
@example
|
||||||
export ACLOCAL_PATH=/usr/share/aclocal
|
export ACLOCAL_PATH=/usr/share/aclocal
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
See @pxref{Macro Search Path,,, automake, The GNU Automake Manual} for
|
@xref{Macro Search Path,,, automake, The GNU Automake Manual}, for
|
||||||
more information.
|
more information.
|
||||||
|
|
||||||
Then, run @command{./configure} as usual.
|
Then, run @command{./configure} as usual.
|
||||||
|
|
@ -86,11 +108,40 @@ Similarly, for a Guile session using the Guix modules:
|
||||||
|
|
||||||
@example
|
@example
|
||||||
$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'
|
$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'
|
||||||
|
|
||||||
|
;;; ("x86_64-linux")
|
||||||
|
@end example
|
||||||
|
|
||||||
|
@noindent
|
||||||
|
@cindex REPL
|
||||||
|
@cindex read-eval-print loop
|
||||||
|
@dots{} and for a REPL (@pxref{Using Guile Interactively,,, guile, Guile
|
||||||
|
Reference Manual}):
|
||||||
|
|
||||||
|
@example
|
||||||
|
$ ./pre-inst-env guile
|
||||||
|
scheme@@(guile-user)> ,use(guix)
|
||||||
|
scheme@@(guile-user)> ,use(gnu)
|
||||||
|
scheme@@(guile-user)> (define snakes
|
||||||
|
(fold-packages
|
||||||
|
(lambda (package lst)
|
||||||
|
(if (string-prefix? "python"
|
||||||
|
(package-name package))
|
||||||
|
(cons package lst)
|
||||||
|
lst))
|
||||||
|
'()))
|
||||||
|
scheme@@(guile-user)> (length snakes)
|
||||||
|
$1 = 361
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
The @command{pre-inst-env} script sets up all the environment variables
|
The @command{pre-inst-env} script sets up all the environment variables
|
||||||
necessary to support this, including @env{PATH} and @env{GUILE_LOAD_PATH}.
|
necessary to support this, including @env{PATH} and @env{GUILE_LOAD_PATH}.
|
||||||
|
|
||||||
|
Note that @command{./pre-inst-env guix pull} does @emph{not} upgrade the
|
||||||
|
local source tree; it simply updates the @file{~/.config/guix/latest}
|
||||||
|
symlink (@pxref{Invoking guix pull}). Run @command{git pull} instead if
|
||||||
|
you want to upgrade your local source tree.
|
||||||
|
|
||||||
|
|
||||||
@node The Perfect Setup
|
@node The Perfect Setup
|
||||||
@section The Perfect Setup
|
@section The Perfect Setup
|
||||||
|
|
@ -111,7 +162,8 @@ that it finds source files from your checkout:
|
||||||
|
|
||||||
@lisp
|
@lisp
|
||||||
;; @r{Assuming the Guix checkout is in ~/src/guix.}
|
;; @r{Assuming the Guix checkout is in ~/src/guix.}
|
||||||
(add-to-list 'geiser-guile-load-path "~/src/guix")
|
(with-eval-after-load 'geiser-guile
|
||||||
|
(add-to-list 'geiser-guile-load-path "~/src/guix"))
|
||||||
@end lisp
|
@end lisp
|
||||||
|
|
||||||
To actually edit the code, Emacs already has a neat Scheme mode. But in
|
To actually edit the code, Emacs already has a neat Scheme mode. But in
|
||||||
|
|
@ -235,15 +287,31 @@ not affected by the change; @code{guix refresh --list-dependent
|
||||||
@var{package}} will help you do that (@pxref{Invoking guix refresh}).
|
@var{package}} will help you do that (@pxref{Invoking guix refresh}).
|
||||||
|
|
||||||
@item
|
@item
|
||||||
|
@cindex determinism, of build processes
|
||||||
|
@cindex reproducible builds, checking
|
||||||
Check whether the package's build process is deterministic. This
|
Check whether the package's build process is deterministic. This
|
||||||
typically means checking whether an independent build of the package
|
typically means checking whether an independent build of the package
|
||||||
yields the exact same result that you obtained, bit for bit.
|
yields the exact same result that you obtained, bit for bit.
|
||||||
|
|
||||||
A simple way to do that is with @command{guix challenge}
|
A simple way to do that is by building the same package several times in
|
||||||
(@pxref{Invoking guix challenge}). You may run it once the package has
|
a row on your machine (@pxref{Invoking guix build}):
|
||||||
been committed and built by @code{hydra.gnu.org} to check whether it
|
|
||||||
obtains the same result as you did. Better yet: Find another machine
|
@example
|
||||||
that can build it and run @command{guix publish}.
|
guix build --rounds=2 my-package
|
||||||
|
@end example
|
||||||
|
|
||||||
|
This is enough to catch a class of common non-determinism issues, such
|
||||||
|
as timestamps or randomly-generated output in the build result.
|
||||||
|
|
||||||
|
Another option is to use @command{guix challenge} (@pxref{Invoking guix
|
||||||
|
challenge}). You may run it once the package has been committed and
|
||||||
|
built by @code{hydra.gnu.org} to check whether it obtains the same
|
||||||
|
result as you did. Better yet: Find another machine that can build it
|
||||||
|
and run @command{guix publish}. Since the remote build machine is
|
||||||
|
likely different from yours, this can catch non-determinism issues
|
||||||
|
related to the hardware---e.g., use of different instruction set
|
||||||
|
extensions---or to the operating system kernel---e.g., reliance on
|
||||||
|
@code{uname} or @file{/proc} files.
|
||||||
|
|
||||||
@end enumerate
|
@end enumerate
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -227,6 +227,8 @@ prefix argument is used. This has the same meaning as @code{--manifest}
|
||||||
option (@pxref{Invoking guix package}).
|
option (@pxref{Invoking guix package}).
|
||||||
|
|
||||||
@item C-c C-z
|
@item C-c C-z
|
||||||
|
@cindex REPL
|
||||||
|
@cindex read-eval-print loop
|
||||||
Go to the Guix REPL (@pxref{The REPL,,, geiser, Geiser User Manual}).
|
Go to the Guix REPL (@pxref{The REPL,,, geiser, Geiser User Manual}).
|
||||||
|
|
||||||
@item h
|
@item h
|
||||||
|
|
@ -644,12 +646,11 @@ Toggle (show/hide) the bodies of all build phases.
|
||||||
@end table
|
@end table
|
||||||
|
|
||||||
There is also @kbd{M-x guix-build-log-minor-mode} which also provides
|
There is also @kbd{M-x guix-build-log-minor-mode} which also provides
|
||||||
the same highlighting (but not key bindings). And as it is a minor
|
the same highlighting and the same key bindings as the major mode, but
|
||||||
mode, it can be enabled in any buffer. For example, if you are building
|
prefixed with @kbd{C-c}. By default, this minor mode is enabled in
|
||||||
some package in a shell buffer (@pxref{Interactive Shell,,, emacs, The
|
shell buffers (@pxref{Interactive Shell,,, emacs, The GNU Emacs
|
||||||
GNU Emacs Manual}), you may enable @command{guix-build-log-minor-mode}
|
Manual}). If you don't like it, set
|
||||||
to make it more colorful. Guix build output is rather specific, so this
|
@code{guix-build-log-minor-mode-activate} to nil.
|
||||||
new highlighting shouldn't conflict with the existing one.
|
|
||||||
|
|
||||||
|
|
||||||
@node Emacs Completions
|
@node Emacs Completions
|
||||||
|
|
|
||||||
716
doc/guix.texi
716
doc/guix.texi
File diff suppressed because it is too large
Load Diff
|
|
@ -2,9 +2,11 @@ digraph "Service Type Dependencies" {
|
||||||
dmd [shape = box, fontname = Helvetica];
|
dmd [shape = box, fontname = Helvetica];
|
||||||
pam [shape = box, fontname = Helvetica];
|
pam [shape = box, fontname = Helvetica];
|
||||||
etc [shape = box, fontname = Helvetica];
|
etc [shape = box, fontname = Helvetica];
|
||||||
|
profile [shape = box, fontname = Helvetica];
|
||||||
accounts [shape = box, fontname = Helvetica];
|
accounts [shape = box, fontname = Helvetica];
|
||||||
activation [shape = box, fontname = Helvetica];
|
activation [shape = box, fontname = Helvetica];
|
||||||
boot [shape = house, fontname = Helvetica];
|
boot [shape = box, fontname = Helvetica];
|
||||||
|
system [shape = house, fontname = Helvetica];
|
||||||
lshd -> dmd;
|
lshd -> dmd;
|
||||||
lshd -> pam;
|
lshd -> pam;
|
||||||
udev -> dmd;
|
udev -> dmd;
|
||||||
|
|
@ -32,4 +34,7 @@ digraph "Service Type Dependencies" {
|
||||||
guix -> dmd;
|
guix -> dmd;
|
||||||
guix -> activation;
|
guix -> activation;
|
||||||
guix -> accounts;
|
guix -> accounts;
|
||||||
|
boot -> system;
|
||||||
|
etc -> system;
|
||||||
|
profile -> system;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -202,7 +202,7 @@ this address (it should be defined by
|
||||||
;; A mix of the code from `geiser-repl--start-repl' and
|
;; A mix of the code from `geiser-repl--start-repl' and
|
||||||
;; `geiser-repl--to-repl-buffer'.
|
;; `geiser-repl--to-repl-buffer'.
|
||||||
(let ((impl 'guile)
|
(let ((impl 'guile)
|
||||||
(geiser-guile-load-path (cons guix-load-path
|
(geiser-guile-load-path (cons (expand-file-name guix-load-path)
|
||||||
geiser-guile-load-path))
|
geiser-guile-load-path))
|
||||||
(geiser-repl-startup-time guix-repl-startup-time))
|
(geiser-repl-startup-time guix-repl-startup-time))
|
||||||
(with-current-buffer buffer
|
(with-current-buffer buffer
|
||||||
|
|
|
||||||
|
|
@ -186,6 +186,10 @@ For the meaning of location, see `guix-find-location'."
|
||||||
"Return a list of names of available graph node types."
|
"Return a list of names of available graph node types."
|
||||||
(guix-eval-read (guix-make-guile-expression 'graph-type-names)))
|
(guix-eval-read (guix-make-guile-expression 'graph-type-names)))
|
||||||
|
|
||||||
|
(guix-memoized-defun guix-refresh-updater-names ()
|
||||||
|
"Return a list of names of available refresh updater types."
|
||||||
|
(guix-eval-read (guix-make-guile-expression 'refresh-updater-names)))
|
||||||
|
|
||||||
(guix-memoized-defun guix-lint-checker-names ()
|
(guix-memoized-defun guix-lint-checker-names ()
|
||||||
"Return a list of names of available lint checkers."
|
"Return a list of names of available lint checkers."
|
||||||
(guix-eval-read (guix-make-guile-expression 'lint-checker-names)))
|
(guix-eval-read (guix-make-guile-expression 'lint-checker-names)))
|
||||||
|
|
@ -1035,7 +1039,7 @@ Each element from GENERATIONS is a generation number."
|
||||||
profile generation)))
|
profile generation)))
|
||||||
(guix-eval-in-repl
|
(guix-eval-in-repl
|
||||||
(guix-make-guile-expression
|
(guix-make-guile-expression
|
||||||
'switch-to-generation profile generation)
|
'switch-to-generation* profile generation)
|
||||||
operation-buffer)))
|
operation-buffer)))
|
||||||
|
|
||||||
(defun guix-package-source-path (package-id)
|
(defun guix-package-source-path (package-id)
|
||||||
|
|
@ -1083,9 +1087,10 @@ FILE. With a prefix argument, also prompt for PROFILE."
|
||||||
file profile)))
|
file profile)))
|
||||||
(guix-eval-in-repl
|
(guix-eval-in-repl
|
||||||
(guix-make-guile-expression
|
(guix-make-guile-expression
|
||||||
'guix-package
|
'guix-command
|
||||||
(concat "--profile=" profile)
|
"package"
|
||||||
(concat "--manifest=" file))
|
(concat "--profile=" (expand-file-name profile))
|
||||||
|
(concat "--manifest=" (expand-file-name file)))
|
||||||
operation-buffer)))
|
operation-buffer)))
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1181,10 +1186,11 @@ The function is called with a single argument - a command line string."
|
||||||
(defun guix-pull (&optional verbose)
|
(defun guix-pull (&optional verbose)
|
||||||
"Run Guix pull operation.
|
"Run Guix pull operation.
|
||||||
If VERBOSE is non-nil (with prefix argument), produce verbose output."
|
If VERBOSE is non-nil (with prefix argument), produce verbose output."
|
||||||
(interactive)
|
(interactive "P")
|
||||||
(let ((args (and verbose '("--verbose"))))
|
(let ((args (and verbose '("--verbose"))))
|
||||||
(guix-eval-in-repl
|
(guix-eval-in-repl
|
||||||
(apply #'guix-make-guile-expression 'guix-pull args)
|
(apply #'guix-make-guile-expression
|
||||||
|
'guix-command "pull" args)
|
||||||
nil 'pull)))
|
nil 'pull)))
|
||||||
|
|
||||||
(provide 'guix-base)
|
(provide 'guix-base)
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,8 @@
|
||||||
|
|
||||||
;;; Code:
|
;;; Code:
|
||||||
|
|
||||||
|
(require 'guix-utils)
|
||||||
|
|
||||||
(defgroup guix-build-log nil
|
(defgroup guix-build-log nil
|
||||||
"Settings for `guix-build-log-mode'."
|
"Settings for `guix-build-log-mode'."
|
||||||
:group 'guix)
|
:group 'guix)
|
||||||
|
|
@ -102,10 +104,13 @@
|
||||||
"Face for the number of seconds for a phase."
|
"Face for the number of seconds for a phase."
|
||||||
:group 'guix-build-log-faces)
|
:group 'guix-build-log-faces)
|
||||||
|
|
||||||
(defcustom guix-build-log-mode-hook
|
(defcustom guix-build-log-minor-mode-activate t
|
||||||
;; Not using `compilation-minor-mode' because it rebinds some standard
|
"If non-nil, then `guix-build-log-minor-mode' is automatically
|
||||||
;; keys, including M-n/M-p.
|
activated in `shell-mode' buffers."
|
||||||
'(compilation-shell-minor-mode view-mode)
|
:type 'boolean
|
||||||
|
:group 'guix-build-log)
|
||||||
|
|
||||||
|
(defcustom guix-build-log-mode-hook '()
|
||||||
"Hook run after `guix-build-log-mode' is entered."
|
"Hook run after `guix-build-log-mode' is entered."
|
||||||
:type 'hook
|
:type 'hook
|
||||||
:group 'guix-build-log)
|
:group 'guix-build-log)
|
||||||
|
|
@ -178,9 +183,8 @@ STATE is a symbol denoting how a build phase was ended. It should be
|
||||||
(3 'guix-build-log-phase-seconds prepend)))
|
(3 'guix-build-log-phase-seconds prepend)))
|
||||||
"A list of `font-lock-keywords' for `guix-build-log-mode'.")
|
"A list of `font-lock-keywords' for `guix-build-log-mode'.")
|
||||||
|
|
||||||
(defvar guix-build-log-mode-map
|
(defvar guix-build-log-common-map
|
||||||
(let ((map (make-sparse-keymap)))
|
(let ((map (make-sparse-keymap)))
|
||||||
(set-keymap-parent map special-mode-map)
|
|
||||||
(define-key map (kbd "M-n") 'guix-build-log-next-phase)
|
(define-key map (kbd "M-n") 'guix-build-log-next-phase)
|
||||||
(define-key map (kbd "M-p") 'guix-build-log-previous-phase)
|
(define-key map (kbd "M-p") 'guix-build-log-previous-phase)
|
||||||
(define-key map (kbd "TAB") 'guix-build-log-phase-toggle)
|
(define-key map (kbd "TAB") 'guix-build-log-phase-toggle)
|
||||||
|
|
@ -188,8 +192,26 @@ STATE is a symbol denoting how a build phase was ended. It should be
|
||||||
(define-key map (kbd "<backtab>") 'guix-build-log-phase-toggle-all)
|
(define-key map (kbd "<backtab>") 'guix-build-log-phase-toggle-all)
|
||||||
(define-key map [(shift tab)] 'guix-build-log-phase-toggle-all)
|
(define-key map [(shift tab)] 'guix-build-log-phase-toggle-all)
|
||||||
map)
|
map)
|
||||||
|
"Parent keymap for 'build-log' buffers.
|
||||||
|
For `guix-build-log-mode' this map is used as is.
|
||||||
|
For `guix-build-log-minor-mode' this map is prefixed with 'C-c'.")
|
||||||
|
|
||||||
|
(defvar guix-build-log-mode-map
|
||||||
|
(let ((map (make-sparse-keymap)))
|
||||||
|
(set-keymap-parent
|
||||||
|
map (make-composed-keymap (list guix-build-log-common-map)
|
||||||
|
special-mode-map))
|
||||||
|
(define-key map (kbd "c") 'compilation-shell-minor-mode)
|
||||||
|
(define-key map (kbd "v") 'view-mode)
|
||||||
|
map)
|
||||||
"Keymap for `guix-build-log-mode' buffers.")
|
"Keymap for `guix-build-log-mode' buffers.")
|
||||||
|
|
||||||
|
(defvar guix-build-log-minor-mode-map
|
||||||
|
(let ((map (make-sparse-keymap)))
|
||||||
|
(define-key map (kbd "C-c") guix-build-log-common-map)
|
||||||
|
map)
|
||||||
|
"Keymap for `guix-build-log-minor-mode' buffers.")
|
||||||
|
|
||||||
(defun guix-build-log-phase-start (&optional with-header?)
|
(defun guix-build-log-phase-start (&optional with-header?)
|
||||||
"Return the start point of the current build phase.
|
"Return the start point of the current build phase.
|
||||||
If WITH-HEADER? is non-nil, do not skip 'starting phase ...' header.
|
If WITH-HEADER? is non-nil, do not skip 'starting phase ...' header.
|
||||||
|
|
@ -319,9 +341,12 @@ When Guix Build Log minor mode is enabled, it highlights build
|
||||||
log in the current buffer. This mode can be enabled
|
log in the current buffer. This mode can be enabled
|
||||||
programmatically using hooks:
|
programmatically using hooks:
|
||||||
|
|
||||||
(add-hook 'shell-mode-hook 'guix-build-log-minor-mode)"
|
(add-hook 'shell-mode-hook 'guix-build-log-minor-mode)
|
||||||
|
|
||||||
|
\\{guix-build-log-minor-mode-map}"
|
||||||
:init-value nil
|
:init-value nil
|
||||||
:lighter " Guix-Build-Log"
|
:lighter " Guix-Build-Log"
|
||||||
|
:keymap guix-build-log-minor-mode-map
|
||||||
:group 'guix-build-log
|
:group 'guix-build-log
|
||||||
(if guix-build-log-minor-mode
|
(if guix-build-log-minor-mode
|
||||||
(font-lock-add-keywords nil guix-build-log-font-lock-keywords)
|
(font-lock-add-keywords nil guix-build-log-font-lock-keywords)
|
||||||
|
|
@ -329,6 +354,25 @@ programmatically using hooks:
|
||||||
(when font-lock-mode
|
(when font-lock-mode
|
||||||
(font-lock-fontify-buffer)))
|
(font-lock-fontify-buffer)))
|
||||||
|
|
||||||
|
;;;###autoload
|
||||||
|
(defun guix-build-log-minor-mode-activate-maybe ()
|
||||||
|
"Activate `guix-build-log-minor-mode' depending on
|
||||||
|
`guix-build-log-minor-mode-activate' variable."
|
||||||
|
(when guix-build-log-minor-mode-activate
|
||||||
|
(guix-build-log-minor-mode)))
|
||||||
|
|
||||||
|
(defun guix-build-log-find-file (file-or-url)
|
||||||
|
"Open FILE-OR-URL in `guix-build-log-mode'."
|
||||||
|
(guix-find-file-or-url file-or-url)
|
||||||
|
(guix-build-log-mode))
|
||||||
|
|
||||||
|
;;;###autoload
|
||||||
|
(add-to-list 'auto-mode-alist
|
||||||
|
;; Regexp for log files (usually placed in /var/log/guix/...)
|
||||||
|
(cons (rx "/guix/drvs/" (= 2 alnum) "/" (= 30 alnum)
|
||||||
|
"-" (+ (any alnum "-+.")) ".drv" string-end)
|
||||||
|
'guix-build-log-mode))
|
||||||
|
|
||||||
(provide 'guix-build-log)
|
(provide 'guix-build-log)
|
||||||
|
|
||||||
;;; guix-build-log.el ends here
|
;;; guix-build-log.el ends here
|
||||||
|
|
|
||||||
|
|
@ -65,6 +65,7 @@
|
||||||
(require 'guix-help-vars)
|
(require 'guix-help-vars)
|
||||||
(require 'guix-read)
|
(require 'guix-read)
|
||||||
(require 'guix-base)
|
(require 'guix-base)
|
||||||
|
(require 'guix-build-log)
|
||||||
(require 'guix-guile)
|
(require 'guix-guile)
|
||||||
(require 'guix-external)
|
(require 'guix-external)
|
||||||
|
|
||||||
|
|
@ -131,7 +132,8 @@ to be modified."
|
||||||
|
|
||||||
(guix-command-define-argument-improver
|
(guix-command-define-argument-improver
|
||||||
guix-command-improve-action-argument
|
guix-command-improve-action-argument
|
||||||
'(("graph" :char ?G)
|
'(("container" :char ?C)
|
||||||
|
("graph" :char ?G)
|
||||||
("environment" :char ?E)
|
("environment" :char ?E)
|
||||||
("publish" :char ?u)
|
("publish" :char ?u)
|
||||||
("pull" :char ?P)
|
("pull" :char ?P)
|
||||||
|
|
@ -173,7 +175,8 @@ to be modified."
|
||||||
(defvar guix-command-improve-common-build-argument
|
(defvar guix-command-improve-common-build-argument
|
||||||
'(("--no-substitutes" :char ?s)
|
'(("--no-substitutes" :char ?s)
|
||||||
("--no-build-hook" :char ?h)
|
("--no-build-hook" :char ?h)
|
||||||
("--max-silent-time" :char ?x)))
|
("--max-silent-time" :char ?x)
|
||||||
|
("--rounds" :char ?R :fun read-number)))
|
||||||
|
|
||||||
(defun guix-command-improve-common-build-argument (argument)
|
(defun guix-command-improve-common-build-argument (argument)
|
||||||
(guix-command-modify-argument-from-alist
|
(guix-command-modify-argument-from-alist
|
||||||
|
|
@ -195,7 +198,11 @@ to be modified."
|
||||||
|
|
||||||
(guix-command-define-argument-improver
|
(guix-command-define-argument-improver
|
||||||
guix-command-improve-environment-argument
|
guix-command-improve-environment-argument
|
||||||
'(("--exec" :fun read-shell-command)
|
'(("--ad-hoc"
|
||||||
|
:name "--ad-hoc " :fun guix-read-package-names-string
|
||||||
|
:switch? nil :option? t)
|
||||||
|
("--expose" :char ?E)
|
||||||
|
("--share" :char ?S)
|
||||||
("--load" :fun guix-read-file-name)))
|
("--load" :fun guix-read-file-name)))
|
||||||
|
|
||||||
(guix-command-define-argument-improver
|
(guix-command-define-argument-improver
|
||||||
|
|
@ -234,6 +241,7 @@ to be modified."
|
||||||
:switch? nil :option? t)
|
:switch? nil :option? t)
|
||||||
("--install-from-file" :fun guix-read-file-name)
|
("--install-from-file" :fun guix-read-file-name)
|
||||||
("--manifest" :fun guix-read-file-name)
|
("--manifest" :fun guix-read-file-name)
|
||||||
|
("--profile" :fun guix-read-file-name)
|
||||||
("--do-not-upgrade" :char ?U)
|
("--do-not-upgrade" :char ?U)
|
||||||
("--roll-back" :char ?R)
|
("--roll-back" :char ?R)
|
||||||
("--show" :char ?w :fun guix-read-package-name)))
|
("--show" :char ?w :fun guix-read-package-name)))
|
||||||
|
|
@ -241,6 +249,7 @@ to be modified."
|
||||||
(guix-command-define-argument-improver
|
(guix-command-define-argument-improver
|
||||||
guix-command-improve-refresh-argument
|
guix-command-improve-refresh-argument
|
||||||
'(("--select" :fun guix-read-refresh-subset)
|
'(("--select" :fun guix-read-refresh-subset)
|
||||||
|
("--type" :fun guix-read-refresh-updater-names-string)
|
||||||
("--key-server" :char ?S)))
|
("--key-server" :char ?S)))
|
||||||
|
|
||||||
(guix-command-define-argument-improver
|
(guix-command-define-argument-improver
|
||||||
|
|
@ -364,11 +373,16 @@ to be modified."
|
||||||
:name "-- " :char ?= :option? t args)))
|
:name "-- " :char ?= :option? t args)))
|
||||||
(let ((command (car commands)))
|
(let ((command (car commands)))
|
||||||
(cond
|
(cond
|
||||||
((member command '("archive" "build" "graph" "edit"
|
((member command
|
||||||
"environment" "lint" "refresh"))
|
'("archive" "build" "challenge" "edit"
|
||||||
|
"graph" "lint" "refresh"))
|
||||||
(argument :doc "Packages" :fun 'guix-read-package-names-string))
|
(argument :doc "Packages" :fun 'guix-read-package-names-string))
|
||||||
|
((equal commands '("container" "exec"))
|
||||||
|
(argument :doc "PID Command [Args...]"))
|
||||||
((string= command "download")
|
((string= command "download")
|
||||||
(argument :doc "URL"))
|
(argument :doc "URL"))
|
||||||
|
((string= command "environment")
|
||||||
|
(argument :doc "Command [Args...]" :fun 'read-shell-command))
|
||||||
((string= command "gc")
|
((string= command "gc")
|
||||||
(argument :doc "Paths" :fun 'guix-read-file-name))
|
(argument :doc "Paths" :fun 'guix-read-file-name))
|
||||||
((member command '("hash" "system"))
|
((member command '("hash" "system"))
|
||||||
|
|
@ -382,10 +396,22 @@ to be modified."
|
||||||
(string= command "import"))
|
(string= command "import"))
|
||||||
(argument :doc "Package name"))))))
|
(argument :doc "Package name"))))))
|
||||||
|
|
||||||
|
(defvar guix-command-additional-arguments
|
||||||
|
`((("environment")
|
||||||
|
,(guix-command-make-argument
|
||||||
|
:name "++packages " :char ?p :option? t
|
||||||
|
:doc "build inputs of the specified packages"
|
||||||
|
:fun 'guix-read-package-names-string)))
|
||||||
|
"Alist of guix commands and additional arguments for them.
|
||||||
|
These are 'fake' arguments that are not presented in 'guix' shell
|
||||||
|
commands.")
|
||||||
|
|
||||||
(defun guix-command-additional-arguments (&optional commands)
|
(defun guix-command-additional-arguments (&optional commands)
|
||||||
"Return additional arguments for COMMANDS."
|
"Return additional arguments for COMMANDS."
|
||||||
(let ((rest-arg (guix-command-rest-argument commands)))
|
(let ((rest-arg (guix-command-rest-argument commands)))
|
||||||
(and rest-arg (list rest-arg))))
|
(append (guix-assoc-value guix-command-additional-arguments
|
||||||
|
commands)
|
||||||
|
(and rest-arg (list rest-arg)))))
|
||||||
|
|
||||||
;; Ideally only `guix-command-arguments' function should exist with the
|
;; Ideally only `guix-command-arguments' function should exist with the
|
||||||
;; contents of `guix-command-all-arguments', but we need to make a
|
;; contents of `guix-command-all-arguments', but we need to make a
|
||||||
|
|
@ -463,28 +489,113 @@ to be modified."
|
||||||
"Return actions from ARGUMENTS."
|
"Return actions from ARGUMENTS."
|
||||||
(cl-remove-if-not #'guix-command-argument-action? arguments))
|
(cl-remove-if-not #'guix-command-argument-action? arguments))
|
||||||
|
|
||||||
(defun guix-command-post-process-args (args)
|
|
||||||
"Adjust appropriately command line ARGS returned from popup command."
|
;;; Post processing popup arguments
|
||||||
;; XXX We need to split "--install foo bar" and similar strings into
|
|
||||||
;; lists of strings. But some commands (e.g., 'guix hash') accept a
|
(defvar guix-command-post-processors
|
||||||
;; file name as the 'rest' argument, and as file names may contain
|
'(("environment"
|
||||||
;; spaces, splitting by spaces will break such names. For example, the
|
guix-command-post-process-environment-packages
|
||||||
;; following argument: "-- /tmp/file with spaces" will be transformed
|
guix-command-post-process-environment-ad-hoc
|
||||||
;; into the following list: ("--" "/tmp/file" "with" "spaces") instead
|
guix-command-post-process-rest-multiple-leave)
|
||||||
;; of the wished ("--" "/tmp/file with spaces").
|
("hash"
|
||||||
(let* (rest
|
guix-command-post-process-rest-single)
|
||||||
(rx (rx string-start
|
("package"
|
||||||
(or "-- " "--install " "--remove ")))
|
guix-command-post-process-package-args)
|
||||||
|
("system"
|
||||||
|
guix-command-post-process-rest-single))
|
||||||
|
"Alist of guix commands and functions for post-processing
|
||||||
|
a list of arguments returned from popup interface.
|
||||||
|
Each function is called on the returned arguments in turn.")
|
||||||
|
|
||||||
|
(defvar guix-command-rest-arg-regexp
|
||||||
|
(rx string-start "-- " (group (+ any)))
|
||||||
|
"Regexp to match a string with the 'rest' arguments.")
|
||||||
|
|
||||||
|
(defun guix-command-replace-args (args predicate modifier)
|
||||||
|
"Replace arguments matching PREDICATE from ARGS.
|
||||||
|
Call MODIFIER on each argument matching PREDICATE and append the
|
||||||
|
returned list of strings to the end of ARGS. Remove the original
|
||||||
|
arguments."
|
||||||
|
(let* ((rest nil)
|
||||||
(args (mapcar (lambda (arg)
|
(args (mapcar (lambda (arg)
|
||||||
(if (string-match-p rx arg)
|
(if (funcall predicate arg)
|
||||||
(progn (push (split-string arg) rest)
|
(progn
|
||||||
nil)
|
(push (funcall modifier arg) rest)
|
||||||
|
nil)
|
||||||
arg))
|
arg))
|
||||||
args)))
|
args)))
|
||||||
(if rest
|
(if rest
|
||||||
(apply #'append (delq nil args) rest)
|
(apply #'append (delq nil args) rest)
|
||||||
args)))
|
args)))
|
||||||
|
|
||||||
|
(cl-defun guix-command-post-process-matching-args (args regexp
|
||||||
|
&key group split?)
|
||||||
|
"Modify arguments from ARGS matching REGEXP by moving them to
|
||||||
|
the end of ARGS list. If SPLIT? is non-nil, split matching
|
||||||
|
arguments into multiple subarguments."
|
||||||
|
(guix-command-replace-args
|
||||||
|
args
|
||||||
|
(lambda (arg)
|
||||||
|
(string-match regexp arg))
|
||||||
|
(lambda (arg)
|
||||||
|
(let ((val (match-string (or group 0) arg))
|
||||||
|
(fun (if split? #'split-string #'list)))
|
||||||
|
(funcall fun val)))))
|
||||||
|
|
||||||
|
(defun guix-command-post-process-rest-single (args)
|
||||||
|
"Modify ARGS by moving '-- ARG' argument to the end of ARGS list."
|
||||||
|
(guix-command-post-process-matching-args
|
||||||
|
args guix-command-rest-arg-regexp
|
||||||
|
:group 1))
|
||||||
|
|
||||||
|
(defun guix-command-post-process-rest-multiple (args)
|
||||||
|
"Modify ARGS by splitting '-- ARG ...' into multiple subarguments
|
||||||
|
and moving them to the end of ARGS list.
|
||||||
|
Remove '-- ' string."
|
||||||
|
(guix-command-post-process-matching-args
|
||||||
|
args guix-command-rest-arg-regexp
|
||||||
|
:group 1
|
||||||
|
:split? t))
|
||||||
|
|
||||||
|
(defun guix-command-post-process-rest-multiple-leave (args)
|
||||||
|
"Modify ARGS by splitting '-- ARG ...' into multiple subarguments
|
||||||
|
and moving them to the end of ARGS list.
|
||||||
|
Leave '--' string as a separate argument."
|
||||||
|
(guix-command-post-process-matching-args
|
||||||
|
args guix-command-rest-arg-regexp
|
||||||
|
:split? t))
|
||||||
|
|
||||||
|
(defun guix-command-post-process-package-args (args)
|
||||||
|
"Adjust popup ARGS for 'guix package' command."
|
||||||
|
(guix-command-post-process-matching-args
|
||||||
|
args (rx string-start (or "--install " "--remove ") (+ any))
|
||||||
|
:split? t))
|
||||||
|
|
||||||
|
(defun guix-command-post-process-environment-packages (args)
|
||||||
|
"Adjust popup ARGS for specified packages of 'guix environment'
|
||||||
|
command."
|
||||||
|
(guix-command-post-process-matching-args
|
||||||
|
args (rx string-start "++packages " (group (+ any)))
|
||||||
|
:group 1
|
||||||
|
:split? t))
|
||||||
|
|
||||||
|
(defun guix-command-post-process-environment-ad-hoc (args)
|
||||||
|
"Adjust popup ARGS for '--ad-hoc' argument of 'guix environment'
|
||||||
|
command."
|
||||||
|
(guix-command-post-process-matching-args
|
||||||
|
args (rx string-start "--ad-hoc " (+ any))
|
||||||
|
:split? t))
|
||||||
|
|
||||||
|
(defun guix-command-post-process-args (commands args)
|
||||||
|
"Adjust popup ARGS for guix COMMANDS."
|
||||||
|
(let* ((command (car commands))
|
||||||
|
(processors
|
||||||
|
(append (guix-assoc-value guix-command-post-processors commands)
|
||||||
|
(guix-assoc-value guix-command-post-processors command))))
|
||||||
|
(guix-modify args
|
||||||
|
(or processors
|
||||||
|
(list #'guix-command-post-process-rest-multiple)))))
|
||||||
|
|
||||||
|
|
||||||
;;; 'Execute' actions
|
;;; 'Execute' actions
|
||||||
|
|
||||||
|
|
@ -583,8 +694,7 @@ open the log file(s)."
|
||||||
(output (guix-command-output args))
|
(output (guix-command-output args))
|
||||||
(files (split-string output "\n" t)))
|
(files (split-string output "\n" t)))
|
||||||
(dolist (file files)
|
(dolist (file files)
|
||||||
(guix-find-file-or-url file)
|
(guix-build-log-find-file file))))
|
||||||
(guix-build-log-mode))))
|
|
||||||
|
|
||||||
(defun guix-run-view-graph (args)
|
(defun guix-run-view-graph (args)
|
||||||
"Run 'guix ARGS ...' graph command, make the image and open it."
|
"Run 'guix ARGS ...' graph command, make the image and open it."
|
||||||
|
|
@ -640,7 +750,8 @@ EXECUTOR function is called with the current command line arguments."
|
||||||
,doc
|
,doc
|
||||||
(interactive (,arguments-fun))
|
(interactive (,arguments-fun))
|
||||||
(,executor (append ',commands
|
(,executor (append ',commands
|
||||||
(guix-command-post-process-args args))))))
|
(guix-command-post-process-args
|
||||||
|
',commands args))))))
|
||||||
|
|
||||||
(defun guix-command-generate-popup-actions (actions &optional commands)
|
(defun guix-command-generate-popup-actions (actions &optional commands)
|
||||||
"Generate 'popup' commands from ACTIONS arguments for guix COMMANDS."
|
"Generate 'popup' commands from ACTIONS arguments for guix COMMANDS."
|
||||||
|
|
|
||||||
|
|
@ -198,6 +198,7 @@ to find 'modify-phases' keywords."
|
||||||
"mbegin"
|
"mbegin"
|
||||||
"mlet"
|
"mlet"
|
||||||
"mlet*"
|
"mlet*"
|
||||||
|
"modify-services"
|
||||||
"munless"
|
"munless"
|
||||||
"mwhen"
|
"mwhen"
|
||||||
"run-with-state"
|
"run-with-state"
|
||||||
|
|
@ -288,6 +289,7 @@ Each rule should have a form (SYMBOL VALUE). See `put' for details."
|
||||||
(mlet 2)
|
(mlet 2)
|
||||||
(mlet* 2)
|
(mlet* 2)
|
||||||
(modify-phases 1)
|
(modify-phases 1)
|
||||||
|
(modify-services 1)
|
||||||
(munless 1)
|
(munless 1)
|
||||||
(mwhen 1)
|
(mwhen 1)
|
||||||
(operating-system 0)
|
(operating-system 0)
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,11 @@ they are successfully installed."
|
||||||
(defvar guix-emacs-autoloads nil
|
(defvar guix-emacs-autoloads nil
|
||||||
"List of the last loaded Emacs autoloads.")
|
"List of the last loaded Emacs autoloads.")
|
||||||
|
|
||||||
|
(defvar guix-emacs-autoloads-regexp
|
||||||
|
(rx (group (* any) "-autoloads")
|
||||||
|
".el" (zero-or-one "c") string-end)
|
||||||
|
"Regexp to match Emacs 'autoloads' file.")
|
||||||
|
|
||||||
(defun guix-emacs-directory (&optional profile)
|
(defun guix-emacs-directory (&optional profile)
|
||||||
"Return directory with Emacs packages installed in PROFILE.
|
"Return directory with Emacs packages installed in PROFILE.
|
||||||
If PROFILE is nil, use `guix-user-profile'."
|
If PROFILE is nil, use `guix-user-profile'."
|
||||||
|
|
@ -44,8 +49,15 @@ If PROFILE is nil, use `guix-user-profile'."
|
||||||
(or profile guix-user-profile)))
|
(or profile guix-user-profile)))
|
||||||
|
|
||||||
(defun guix-emacs-find-autoloads-in-directory (directory)
|
(defun guix-emacs-find-autoloads-in-directory (directory)
|
||||||
"Return list of Emacs 'autoloads' files in DIRECTORY."
|
"Return a list of Emacs 'autoloads' files in DIRECTORY.
|
||||||
(directory-files directory 'full-name "-autoloads\\.el\\'" 'no-sort))
|
The files in the list do not have extensions (.el, .elc)."
|
||||||
|
(cl-remove-duplicates
|
||||||
|
(delq nil
|
||||||
|
(mapcar (lambda (file)
|
||||||
|
(when (string-match guix-emacs-autoloads-regexp file)
|
||||||
|
(match-string 1 file)))
|
||||||
|
(directory-files directory 'full-name nil 'no-sort)))
|
||||||
|
:test #'string=))
|
||||||
|
|
||||||
(defun guix-emacs-subdirs (directory)
|
(defun guix-emacs-subdirs (directory)
|
||||||
"Return list of DIRECTORY subdirectories."
|
"Return list of DIRECTORY subdirectories."
|
||||||
|
|
@ -74,29 +86,33 @@ Return nil if there are no emacs packages installed in PROFILE."
|
||||||
nil)))
|
nil)))
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun guix-emacs-load-autoloads (&optional all)
|
(defun guix-emacs-load-autoloads (&optional profile)
|
||||||
"Load autoloads for Emacs packages installed in a user profile.
|
"Load autoloads for Emacs packages installed in PROFILE.
|
||||||
Add autoloads directories to `load-path'.
|
If PROFILE is nil, use `guix-user-profile'.
|
||||||
If ALL is nil, activate only those packages that were installed
|
Add autoloads directories to `load-path'."
|
||||||
after the last activation, otherwise activate all Emacs packages
|
(interactive (list (guix-profile-prompt)))
|
||||||
installed in `guix-user-profile'."
|
(let* ((autoloads (guix-emacs-find-autoloads profile))
|
||||||
(interactive "P")
|
(new-autoloads (cl-nset-difference autoloads
|
||||||
(let* ((autoloads (guix-emacs-find-autoloads))
|
guix-emacs-autoloads
|
||||||
(files (if all
|
:test #'string=)))
|
||||||
autoloads
|
(dolist (file new-autoloads)
|
||||||
(cl-nset-difference autoloads guix-emacs-autoloads
|
(cl-pushnew (directory-file-name (file-name-directory file))
|
||||||
:test #'string=))))
|
load-path
|
||||||
(dolist (file files)
|
|
||||||
(cl-pushnew (file-name-directory file) load-path
|
|
||||||
:test #'string=)
|
:test #'string=)
|
||||||
(load file 'noerror))
|
(load file 'noerror))
|
||||||
(setq guix-emacs-autoloads autoloads)))
|
(setq guix-emacs-autoloads
|
||||||
|
(append new-autoloads guix-emacs-autoloads))))
|
||||||
|
|
||||||
(defun guix-emacs-load-autoloads-maybe ()
|
(defun guix-emacs-load-autoloads-maybe ()
|
||||||
"Load autoloads for Emacs packages if needed.
|
"Load autoloads for Emacs packages if needed.
|
||||||
See `guix-emacs-activate-after-operation' for details."
|
See `guix-emacs-activate-after-operation' for details."
|
||||||
(and guix-emacs-activate-after-operation
|
(and guix-emacs-activate-after-operation
|
||||||
(guix-emacs-load-autoloads)))
|
;; FIXME Since a user can work with a non-current profile (using
|
||||||
|
;; C-u before `guix-search-by-name' and other commands), emacs
|
||||||
|
;; packages can be installed to another profile, and the
|
||||||
|
;; following code will not work (i.e., the autoloads for this
|
||||||
|
;; profile will not be loaded).
|
||||||
|
(guix-emacs-load-autoloads guix-current-profile)))
|
||||||
|
|
||||||
(provide 'guix-emacs)
|
(provide 'guix-emacs)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,12 @@
|
||||||
:group 'guix-info
|
:group 'guix-info
|
||||||
:group 'guix-faces)
|
:group 'guix-faces)
|
||||||
|
|
||||||
|
(defface guix-info-heading
|
||||||
|
'((((type tty pc) (class color)) :weight bold)
|
||||||
|
(t :height 1.6 :weight bold :inherit variable-pitch))
|
||||||
|
"Face for headings."
|
||||||
|
:group 'guix-info-faces)
|
||||||
|
|
||||||
(defface guix-info-param-title
|
(defface guix-info-param-title
|
||||||
'((t :inherit font-lock-type-face))
|
'((t :inherit font-lock-type-face))
|
||||||
"Face used for titles of parameters."
|
"Face used for titles of parameters."
|
||||||
|
|
@ -374,7 +380,7 @@ If POS is nil, use the current point position."
|
||||||
(interactive)
|
(interactive)
|
||||||
(let ((button (button-at (or pos (point)))))
|
(let ((button (button-at (or pos (point)))))
|
||||||
(when button
|
(when button
|
||||||
(kill-new (button-label button)))))
|
(guix-copy-as-kill (button-label button)))))
|
||||||
|
|
||||||
(defun guix-info-insert-action-button (label action &optional message
|
(defun guix-info-insert-action-button (label action &optional message
|
||||||
&rest properties)
|
&rest properties)
|
||||||
|
|
@ -416,8 +422,7 @@ See `insert-text-button' for the meaning of PROPERTIES."
|
||||||
:required (id installed non-unique))
|
:required (id installed non-unique))
|
||||||
|
|
||||||
(defface guix-package-info-heading
|
(defface guix-package-info-heading
|
||||||
'((((type tty pc) (class color)) :weight bold)
|
'((t :inherit guix-info-heading))
|
||||||
(t :height 1.6 :weight bold :inherit variable-pitch))
|
|
||||||
"Face for package name and version headings."
|
"Face for package name and version headings."
|
||||||
:group 'guix-package-info-faces)
|
:group 'guix-package-info-faces)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,9 @@ avoid loading autoloads of Emacs packages installed in
|
||||||
(add-to-list 'load-path (guix-emacs-directory))
|
(add-to-list 'load-path (guix-emacs-directory))
|
||||||
|
|
||||||
(when guix-package-enable-at-startup
|
(when guix-package-enable-at-startup
|
||||||
(guix-emacs-load-autoloads 'all))
|
(guix-emacs-load-autoloads))
|
||||||
|
|
||||||
(add-hook 'scheme-mode-hook 'guix-devel-activate-mode-maybe)
|
(add-hook 'scheme-mode-hook 'guix-devel-activate-mode-maybe)
|
||||||
|
(add-hook 'shell-mode-hook 'guix-build-log-minor-mode-activate-maybe)
|
||||||
|
|
||||||
(provide 'guix-init)
|
(provide 'guix-init)
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,11 @@
|
||||||
"Face used for file paths."
|
"Face used for file paths."
|
||||||
:group 'guix-list-faces)
|
:group 'guix-list-faces)
|
||||||
|
|
||||||
|
(defface guix-list-time
|
||||||
|
'((t :inherit guix-info-time))
|
||||||
|
"Face used for time stamps."
|
||||||
|
:group 'guix-list-faces)
|
||||||
|
|
||||||
(defcustom guix-list-describe-warning-count 10
|
(defcustom guix-list-describe-warning-count 10
|
||||||
"The maximum number of entries for describing without a warning.
|
"The maximum number of entries for describing without a warning.
|
||||||
If a user wants to describe more than this number of marked
|
If a user wants to describe more than this number of marked
|
||||||
|
|
@ -201,7 +206,8 @@ VAL may be nil."
|
||||||
|
|
||||||
(defun guix-list-get-time (seconds &optional _)
|
(defun guix-list-get-time (seconds &optional _)
|
||||||
"Return formatted time string from SECONDS."
|
"Return formatted time string from SECONDS."
|
||||||
(guix-get-time-string seconds))
|
(guix-get-string (guix-get-time-string seconds)
|
||||||
|
'guix-list-time))
|
||||||
|
|
||||||
(defun guix-list-get-file-path (path &optional _)
|
(defun guix-list-get-file-path (path &optional _)
|
||||||
"Return PATH button specification for `tabulated-list-entries'."
|
"Return PATH button specification for `tabulated-list-entries'."
|
||||||
|
|
|
||||||
|
|
@ -905,7 +905,7 @@ OUTPUTS is a list of package outputs (may be an empty list)."
|
||||||
"~a packages in profile~%"
|
"~a packages in profile~%"
|
||||||
count)
|
count)
|
||||||
count)
|
count)
|
||||||
(display-search-paths entries profile))))))))))
|
(display-search-paths entries (list profile)))))))))))
|
||||||
|
|
||||||
(define (delete-generations* profile generations)
|
(define (delete-generations* profile generations)
|
||||||
"Delete GENERATIONS from PROFILE.
|
"Delete GENERATIONS from PROFILE.
|
||||||
|
|
@ -991,6 +991,11 @@ Return #t if the shell command was executed successfully."
|
||||||
"Return a list of names of available graph node types."
|
"Return a list of names of available graph node types."
|
||||||
(map node-type-name %node-types))
|
(map node-type-name %node-types))
|
||||||
|
|
||||||
|
(define (refresh-updater-names)
|
||||||
|
"Return a list of names of available refresh updater types."
|
||||||
|
(map (@ (guix upstream) upstream-updater-name)
|
||||||
|
(@ (guix scripts refresh) %updaters)))
|
||||||
|
|
||||||
(define (lint-checker-names)
|
(define (lint-checker-names)
|
||||||
"Return a list of names of available lint checkers."
|
"Return a list of names of available lint checkers."
|
||||||
(map (lambda (checker)
|
(map (lambda (checker)
|
||||||
|
|
|
||||||
|
|
@ -128,6 +128,13 @@ subcommands, actions, etc. for this guix COMMAND."
|
||||||
guix-help-parse-regexp-group
|
guix-help-parse-regexp-group
|
||||||
"graph" "--list-types"))
|
"graph" "--list-types"))
|
||||||
|
|
||||||
|
(guix-memoized-defun guix-pcomplete-refresh-updaters ()
|
||||||
|
"Return a list of all available refresh updater types."
|
||||||
|
(guix-pcomplete-run-guix-and-search
|
||||||
|
guix-help-parse-list-regexp
|
||||||
|
guix-help-parse-regexp-group
|
||||||
|
"refresh" "--list-updaters"))
|
||||||
|
|
||||||
|
|
||||||
;;; Completing
|
;;; Completing
|
||||||
|
|
||||||
|
|
@ -209,8 +216,8 @@ group - the argument.")
|
||||||
"Complete argument for guix COMMAND."
|
"Complete argument for guix COMMAND."
|
||||||
(cond
|
(cond
|
||||||
((member command
|
((member command
|
||||||
'("archive" "build" "graph" "edit" "environment"
|
'("archive" "build" "challenge" "edit" "environment"
|
||||||
"lint" "refresh" "size"))
|
"graph" "lint" "refresh" "size"))
|
||||||
(while t
|
(while t
|
||||||
(pcomplete-here (guix-pcomplete-all-packages))))
|
(pcomplete-here (guix-pcomplete-all-packages))))
|
||||||
(t (pcomplete-here* (pcomplete-entries)))))
|
(t (pcomplete-here* (pcomplete-entries)))))
|
||||||
|
|
@ -287,9 +294,13 @@ INPUT is the current partially completed string."
|
||||||
(option? "-u" "--user"))
|
(option? "-u" "--user"))
|
||||||
(complete* (pcmpl-unix-user-names)))
|
(complete* (pcmpl-unix-user-names)))
|
||||||
|
|
||||||
((and (command? "refresh")
|
((command? "refresh")
|
||||||
(option? "-s" "--select"))
|
(cond
|
||||||
(complete* guix-help-refresh-subsets))
|
((option? "-s" "--select")
|
||||||
|
(complete* guix-help-refresh-subsets))
|
||||||
|
((option? "-t" "--type")
|
||||||
|
(guix-pcomplete-complete-comma-args
|
||||||
|
(guix-pcomplete-refresh-updaters)))))
|
||||||
|
|
||||||
((and (command? "size")
|
((and (command? "size")
|
||||||
(option? "-m" "--map-file"))
|
(option? "-m" "--map-file"))
|
||||||
|
|
|
||||||
|
|
@ -136,6 +136,12 @@ keywords are available:
|
||||||
:single-reader guix-read-refresh-subset
|
:single-reader guix-read-refresh-subset
|
||||||
:single-prompt "Refresh subset: ")
|
:single-prompt "Refresh subset: ")
|
||||||
|
|
||||||
|
(guix-define-readers
|
||||||
|
:completions-getter guix-refresh-updater-names
|
||||||
|
:multiple-reader guix-read-refresh-updater-names
|
||||||
|
:multiple-prompt "Refresh updater,s: "
|
||||||
|
:multiple-separator ",")
|
||||||
|
|
||||||
(guix-define-readers
|
(guix-define-readers
|
||||||
:completions-var guix-help-key-policies
|
:completions-var guix-help-key-policies
|
||||||
:single-reader guix-read-key-policy
|
:single-reader guix-read-key-policy
|
||||||
|
|
|
||||||
|
|
@ -226,6 +226,17 @@ single argument."
|
||||||
(while (re-search-forward ,regexp nil t)
|
(while (re-search-forward ,regexp nil t)
|
||||||
,@body)))
|
,@body)))
|
||||||
|
|
||||||
|
(defun guix-modify (object modifiers)
|
||||||
|
"Apply MODIFIERS to OBJECT.
|
||||||
|
OBJECT is passed as an argument to the first function from
|
||||||
|
MODIFIERS list, the returned result is passed to the second
|
||||||
|
function from the list and so on. Return result of the last
|
||||||
|
modifier call."
|
||||||
|
(if (null modifiers)
|
||||||
|
object
|
||||||
|
(guix-modify (funcall (car modifiers) object)
|
||||||
|
(cdr modifiers))))
|
||||||
|
|
||||||
|
|
||||||
;;; Alist accessors
|
;;; Alist accessors
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
# This is a "job" for the Upstart init system to launch 'guix-daemon'.
|
||||||
|
# Drop it in /etc/init to have 'guix-daemon' automatically started.
|
||||||
|
|
||||||
|
description "Build daemon for GNU Guix"
|
||||||
|
|
||||||
|
start on runlevel [2345]
|
||||||
|
|
||||||
|
stop on runlevel [016]
|
||||||
|
|
||||||
|
task
|
||||||
|
|
||||||
|
exec @bindir@/guix-daemon --build-users-group=guixbuild
|
||||||
|
|
@ -25,7 +25,6 @@ GNU_SYSTEM_MODULES = \
|
||||||
gnu.scm \
|
gnu.scm \
|
||||||
gnu/artwork.scm \
|
gnu/artwork.scm \
|
||||||
gnu/packages.scm \
|
gnu/packages.scm \
|
||||||
gnu/packages/aarddict.scm \
|
|
||||||
gnu/packages/abduco.scm \
|
gnu/packages/abduco.scm \
|
||||||
gnu/packages/abiword.scm \
|
gnu/packages/abiword.scm \
|
||||||
gnu/packages/acct.scm \
|
gnu/packages/acct.scm \
|
||||||
|
|
@ -34,8 +33,10 @@ GNU_SYSTEM_MODULES = \
|
||||||
gnu/packages/adns.scm \
|
gnu/packages/adns.scm \
|
||||||
gnu/packages/algebra.scm \
|
gnu/packages/algebra.scm \
|
||||||
gnu/packages/aidc.scm \
|
gnu/packages/aidc.scm \
|
||||||
|
gnu/packages/animation.scm \
|
||||||
gnu/packages/apl.scm \
|
gnu/packages/apl.scm \
|
||||||
gnu/packages/apr.scm \
|
gnu/packages/apr.scm \
|
||||||
|
gnu/packages/aria2.scm \
|
||||||
gnu/packages/asciidoc.scm \
|
gnu/packages/asciidoc.scm \
|
||||||
gnu/packages/aspell.scm \
|
gnu/packages/aspell.scm \
|
||||||
gnu/packages/attr.scm \
|
gnu/packages/attr.scm \
|
||||||
|
|
@ -79,9 +80,11 @@ GNU_SYSTEM_MODULES = \
|
||||||
gnu/packages/cyrus-sasl.scm \
|
gnu/packages/cyrus-sasl.scm \
|
||||||
gnu/packages/databases.scm \
|
gnu/packages/databases.scm \
|
||||||
gnu/packages/datamash.scm \
|
gnu/packages/datamash.scm \
|
||||||
|
gnu/packages/datastructures.scm \
|
||||||
gnu/packages/dc.scm \
|
gnu/packages/dc.scm \
|
||||||
gnu/packages/debug.scm \
|
gnu/packages/debug.scm \
|
||||||
gnu/packages/dejagnu.scm \
|
gnu/packages/dejagnu.scm \
|
||||||
|
gnu/packages/dico.scm \
|
||||||
gnu/packages/dictionaries.scm \
|
gnu/packages/dictionaries.scm \
|
||||||
gnu/packages/disk.scm \
|
gnu/packages/disk.scm \
|
||||||
gnu/packages/djvu.scm \
|
gnu/packages/djvu.scm \
|
||||||
|
|
@ -121,7 +124,6 @@ GNU_SYSTEM_MODULES = \
|
||||||
gnu/packages/gcc.scm \
|
gnu/packages/gcc.scm \
|
||||||
gnu/packages/gd.scm \
|
gnu/packages/gd.scm \
|
||||||
gnu/packages/gdb.scm \
|
gnu/packages/gdb.scm \
|
||||||
gnu/packages/gdbm.scm \
|
|
||||||
gnu/packages/geeqie.scm \
|
gnu/packages/geeqie.scm \
|
||||||
gnu/packages/gettext.scm \
|
gnu/packages/gettext.scm \
|
||||||
gnu/packages/ghostscript.scm \
|
gnu/packages/ghostscript.scm \
|
||||||
|
|
@ -160,6 +162,7 @@ GNU_SYSTEM_MODULES = \
|
||||||
gnu/packages/image.scm \
|
gnu/packages/image.scm \
|
||||||
gnu/packages/imagemagick.scm \
|
gnu/packages/imagemagick.scm \
|
||||||
gnu/packages/indent.scm \
|
gnu/packages/indent.scm \
|
||||||
|
gnu/packages/inklingreader.scm \
|
||||||
gnu/packages/inkscape.scm \
|
gnu/packages/inkscape.scm \
|
||||||
gnu/packages/irssi.scm \
|
gnu/packages/irssi.scm \
|
||||||
gnu/packages/iso-codes.scm \
|
gnu/packages/iso-codes.scm \
|
||||||
|
|
@ -170,6 +173,7 @@ GNU_SYSTEM_MODULES = \
|
||||||
gnu/packages/kde.scm \
|
gnu/packages/kde.scm \
|
||||||
gnu/packages/kde-frameworks.scm \
|
gnu/packages/kde-frameworks.scm \
|
||||||
gnu/packages/key-mon.scm \
|
gnu/packages/key-mon.scm \
|
||||||
|
gnu/packages/kodi.scm \
|
||||||
gnu/packages/language.scm \
|
gnu/packages/language.scm \
|
||||||
gnu/packages/less.scm \
|
gnu/packages/less.scm \
|
||||||
gnu/packages/lesstif.scm \
|
gnu/packages/lesstif.scm \
|
||||||
|
|
@ -243,6 +247,7 @@ GNU_SYSTEM_MODULES = \
|
||||||
gnu/packages/openstack.scm \
|
gnu/packages/openstack.scm \
|
||||||
gnu/packages/orpheus.scm \
|
gnu/packages/orpheus.scm \
|
||||||
gnu/packages/ots.scm \
|
gnu/packages/ots.scm \
|
||||||
|
gnu/packages/owncloud.scm \
|
||||||
gnu/packages/package-management.scm \
|
gnu/packages/package-management.scm \
|
||||||
gnu/packages/parallel.scm \
|
gnu/packages/parallel.scm \
|
||||||
gnu/packages/password-utils.scm \
|
gnu/packages/password-utils.scm \
|
||||||
|
|
@ -266,6 +271,7 @@ GNU_SYSTEM_MODULES = \
|
||||||
gnu/packages/python.scm \
|
gnu/packages/python.scm \
|
||||||
gnu/packages/qemu.scm \
|
gnu/packages/qemu.scm \
|
||||||
gnu/packages/qt.scm \
|
gnu/packages/qt.scm \
|
||||||
|
gnu/packages/ragel.scm \
|
||||||
gnu/packages/ratpoison.scm \
|
gnu/packages/ratpoison.scm \
|
||||||
gnu/packages/rc.scm \
|
gnu/packages/rc.scm \
|
||||||
gnu/packages/rdesktop.scm \
|
gnu/packages/rdesktop.scm \
|
||||||
|
|
@ -280,8 +286,10 @@ GNU_SYSTEM_MODULES = \
|
||||||
gnu/packages/scanner.scm \
|
gnu/packages/scanner.scm \
|
||||||
gnu/packages/scheme.scm \
|
gnu/packages/scheme.scm \
|
||||||
gnu/packages/screen.scm \
|
gnu/packages/screen.scm \
|
||||||
|
gnu/packages/scribus.scm \
|
||||||
gnu/packages/sdl.scm \
|
gnu/packages/sdl.scm \
|
||||||
gnu/packages/search.scm \
|
gnu/packages/search.scm \
|
||||||
|
gnu/packages/serialization.scm \
|
||||||
gnu/packages/serveez.scm \
|
gnu/packages/serveez.scm \
|
||||||
gnu/packages/shishi.scm \
|
gnu/packages/shishi.scm \
|
||||||
gnu/packages/skarnet.scm \
|
gnu/packages/skarnet.scm \
|
||||||
|
|
@ -301,6 +309,7 @@ GNU_SYSTEM_MODULES = \
|
||||||
gnu/packages/tcl.scm \
|
gnu/packages/tcl.scm \
|
||||||
gnu/packages/tcsh.scm \
|
gnu/packages/tcsh.scm \
|
||||||
gnu/packages/telephony.scm \
|
gnu/packages/telephony.scm \
|
||||||
|
gnu/packages/terminals.scm \
|
||||||
gnu/packages/texinfo.scm \
|
gnu/packages/texinfo.scm \
|
||||||
gnu/packages/texlive.scm \
|
gnu/packages/texlive.scm \
|
||||||
gnu/packages/textutils.scm \
|
gnu/packages/textutils.scm \
|
||||||
|
|
@ -361,11 +370,11 @@ GNU_SYSTEM_MODULES = \
|
||||||
gnu/system/file-systems.scm \
|
gnu/system/file-systems.scm \
|
||||||
gnu/system/grub.scm \
|
gnu/system/grub.scm \
|
||||||
gnu/system/install.scm \
|
gnu/system/install.scm \
|
||||||
gnu/system/linux.scm \
|
|
||||||
gnu/system/linux-container.scm \
|
gnu/system/linux-container.scm \
|
||||||
gnu/system/linux-initrd.scm \
|
gnu/system/linux-initrd.scm \
|
||||||
gnu/system/locale.scm \
|
gnu/system/locale.scm \
|
||||||
gnu/system/nss.scm \
|
gnu/system/nss.scm \
|
||||||
|
gnu/system/pam.scm \
|
||||||
gnu/system/shadow.scm \
|
gnu/system/shadow.scm \
|
||||||
gnu/system/vm.scm \
|
gnu/system/vm.scm \
|
||||||
\
|
\
|
||||||
|
|
@ -411,7 +420,9 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/binutils-ld-new-dtags.patch \
|
gnu/packages/patches/binutils-ld-new-dtags.patch \
|
||||||
gnu/packages/patches/binutils-loongson-workaround.patch \
|
gnu/packages/patches/binutils-loongson-workaround.patch \
|
||||||
gnu/packages/patches/bitlbee-configure-doc-fix.patch \
|
gnu/packages/patches/bitlbee-configure-doc-fix.patch \
|
||||||
|
gnu/packages/patches/bluez-tests.patch \
|
||||||
gnu/packages/patches/boost-mips-avoid-m32.patch \
|
gnu/packages/patches/boost-mips-avoid-m32.patch \
|
||||||
|
gnu/packages/patches/byobu-writable-status.patch \
|
||||||
gnu/packages/patches/calibre-drop-unrar.patch \
|
gnu/packages/patches/calibre-drop-unrar.patch \
|
||||||
gnu/packages/patches/calibre-no-updates-dialog.patch \
|
gnu/packages/patches/calibre-no-updates-dialog.patch \
|
||||||
gnu/packages/patches/cdparanoia-fpic.patch \
|
gnu/packages/patches/cdparanoia-fpic.patch \
|
||||||
|
|
@ -427,8 +438,10 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/cssc-missing-include.patch \
|
gnu/packages/patches/cssc-missing-include.patch \
|
||||||
gnu/packages/patches/clucene-contribs-lib.patch \
|
gnu/packages/patches/clucene-contribs-lib.patch \
|
||||||
gnu/packages/patches/cursynth-wave-rand.patch \
|
gnu/packages/patches/cursynth-wave-rand.patch \
|
||||||
gnu/packages/patches/dbus-localstatedir.patch \
|
gnu/packages/patches/dbus-helper-search-path.patch \
|
||||||
gnu/packages/patches/dealii-p4est-interface.patch \
|
gnu/packages/patches/dealii-p4est-interface.patch \
|
||||||
|
gnu/packages/patches/devil-fix-libpng.patch \
|
||||||
|
gnu/packages/patches/dico-libtool-deterministic.patch \
|
||||||
gnu/packages/patches/diffutils-gets-undeclared.patch \
|
gnu/packages/patches/diffutils-gets-undeclared.patch \
|
||||||
gnu/packages/patches/dfu-programmer-fix-libusb.patch \
|
gnu/packages/patches/dfu-programmer-fix-libusb.patch \
|
||||||
gnu/packages/patches/doxygen-test.patch \
|
gnu/packages/patches/doxygen-test.patch \
|
||||||
|
|
@ -439,6 +452,7 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/emacs-exec-path.patch \
|
gnu/packages/patches/emacs-exec-path.patch \
|
||||||
gnu/packages/patches/emacs-source-date-epoch.patch \
|
gnu/packages/patches/emacs-source-date-epoch.patch \
|
||||||
gnu/packages/patches/eudev-rules-directory.patch \
|
gnu/packages/patches/eudev-rules-directory.patch \
|
||||||
|
gnu/packages/patches/evilwm-lost-focus-bug.patch \
|
||||||
gnu/packages/patches/expat-CVE-2015-1283.patch \
|
gnu/packages/patches/expat-CVE-2015-1283.patch \
|
||||||
gnu/packages/patches/fastcap-mulGlobal.patch \
|
gnu/packages/patches/fastcap-mulGlobal.patch \
|
||||||
gnu/packages/patches/fastcap-mulSetup.patch \
|
gnu/packages/patches/fastcap-mulSetup.patch \
|
||||||
|
|
@ -484,8 +498,6 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/gobject-introspection-girepository.patch \
|
gnu/packages/patches/gobject-introspection-girepository.patch \
|
||||||
gnu/packages/patches/grub-gets-undeclared.patch \
|
gnu/packages/patches/grub-gets-undeclared.patch \
|
||||||
gnu/packages/patches/grub-freetype.patch \
|
gnu/packages/patches/grub-freetype.patch \
|
||||||
gnu/packages/patches/gsl-poly-test-fix-pt1.patch \
|
|
||||||
gnu/packages/patches/gsl-poly-test-fix-pt2.patch \
|
|
||||||
gnu/packages/patches/guile-1.8-cpp-4.5.patch \
|
gnu/packages/patches/guile-1.8-cpp-4.5.patch \
|
||||||
gnu/packages/patches/guile-arm-fixes.patch \
|
gnu/packages/patches/guile-arm-fixes.patch \
|
||||||
gnu/packages/patches/guile-default-utf8.patch \
|
gnu/packages/patches/guile-default-utf8.patch \
|
||||||
|
|
@ -496,7 +508,6 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
|
gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
|
||||||
gnu/packages/patches/hop-bigloo-4.0b.patch \
|
gnu/packages/patches/hop-bigloo-4.0b.patch \
|
||||||
gnu/packages/patches/hop-linker-flags.patch \
|
gnu/packages/patches/hop-linker-flags.patch \
|
||||||
gnu/packages/patches/hwloc-gather-topology-lstopo.patch \
|
|
||||||
gnu/packages/patches/hydra-automake-1.15.patch \
|
gnu/packages/patches/hydra-automake-1.15.patch \
|
||||||
gnu/packages/patches/hydra-disable-darcs-test.patch \
|
gnu/packages/patches/hydra-disable-darcs-test.patch \
|
||||||
gnu/packages/patches/icecat-avoid-bundled-includes.patch \
|
gnu/packages/patches/icecat-avoid-bundled-includes.patch \
|
||||||
|
|
@ -506,6 +517,7 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/icu4c-CVE-2015-4760.patch \
|
gnu/packages/patches/icu4c-CVE-2015-4760.patch \
|
||||||
gnu/packages/patches/imagemagick-test-segv.patch \
|
gnu/packages/patches/imagemagick-test-segv.patch \
|
||||||
gnu/packages/patches/irrlicht-mesa-10.patch \
|
gnu/packages/patches/irrlicht-mesa-10.patch \
|
||||||
|
gnu/packages/patches/jasper-CVE-2008-3522.patch \
|
||||||
gnu/packages/patches/jbig2dec-ignore-testtest.patch \
|
gnu/packages/patches/jbig2dec-ignore-testtest.patch \
|
||||||
gnu/packages/patches/julia-0.3.10-fix-empty-array.patch \
|
gnu/packages/patches/julia-0.3.10-fix-empty-array.patch \
|
||||||
gnu/packages/patches/kmod-module-directory.patch \
|
gnu/packages/patches/kmod-module-directory.patch \
|
||||||
|
|
@ -520,6 +532,7 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/libarchive-mtree-filename-length-fix.patch \
|
gnu/packages/patches/libarchive-mtree-filename-length-fix.patch \
|
||||||
gnu/packages/patches/libbonobo-activation-test-race.patch \
|
gnu/packages/patches/libbonobo-activation-test-race.patch \
|
||||||
gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch \
|
gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch \
|
||||||
|
gnu/packages/patches/libdrm-symbol-check.patch \
|
||||||
gnu/packages/patches/libevent-dns-tests.patch \
|
gnu/packages/patches/libevent-dns-tests.patch \
|
||||||
gnu/packages/patches/libmtp-devices.patch \
|
gnu/packages/patches/libmtp-devices.patch \
|
||||||
gnu/packages/patches/liboop-mips64-deplibs-fix.patch \
|
gnu/packages/patches/liboop-mips64-deplibs-fix.patch \
|
||||||
|
|
@ -528,8 +541,11 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/libmad-armv7-thumb-pt2.patch \
|
gnu/packages/patches/libmad-armv7-thumb-pt2.patch \
|
||||||
gnu/packages/patches/libmad-frame-length.patch \
|
gnu/packages/patches/libmad-frame-length.patch \
|
||||||
gnu/packages/patches/libmad-mips-newgcc.patch \
|
gnu/packages/patches/libmad-mips-newgcc.patch \
|
||||||
|
gnu/packages/patches/librsvg-tests.patch \
|
||||||
gnu/packages/patches/libtheora-config-guess.patch \
|
gnu/packages/patches/libtheora-config-guess.patch \
|
||||||
gnu/packages/patches/libtool-skip-tests2.patch \
|
gnu/packages/patches/libtool-skip-tests2.patch \
|
||||||
|
gnu/packages/patches/libsndfile-CVE-2014-9496.patch \
|
||||||
|
gnu/packages/patches/libsndfile-CVE-2015-7805.patch \
|
||||||
gnu/packages/patches/libssh-CVE-2014-0017.patch \
|
gnu/packages/patches/libssh-CVE-2014-0017.patch \
|
||||||
gnu/packages/patches/libunwind-CVE-2015-3239.patch \
|
gnu/packages/patches/libunwind-CVE-2015-3239.patch \
|
||||||
gnu/packages/patches/libwmf-CAN-2004-0941.patch \
|
gnu/packages/patches/libwmf-CAN-2004-0941.patch \
|
||||||
|
|
@ -544,11 +560,13 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch \
|
gnu/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch \
|
||||||
gnu/packages/patches/libwmf-CVE-2015-4695.patch \
|
gnu/packages/patches/libwmf-CVE-2015-4695.patch \
|
||||||
gnu/packages/patches/libwmf-CVE-2015-4696.patch \
|
gnu/packages/patches/libwmf-CVE-2015-4696.patch \
|
||||||
|
gnu/packages/patches/libxslt-CVE-2015-7995.patch \
|
||||||
gnu/packages/patches/lirc-localstatedir.patch \
|
gnu/packages/patches/lirc-localstatedir.patch \
|
||||||
gnu/packages/patches/libpthread-glibc-preparation.patch \
|
gnu/packages/patches/libpthread-glibc-preparation.patch \
|
||||||
gnu/packages/patches/lm-sensors-hwmon-attrs.patch \
|
gnu/packages/patches/lm-sensors-hwmon-attrs.patch \
|
||||||
gnu/packages/patches/lua-pkgconfig.patch \
|
gnu/packages/patches/lua-pkgconfig.patch \
|
||||||
gnu/packages/patches/lua51-liblua-so.patch \
|
gnu/packages/patches/lua51-liblua-so.patch \
|
||||||
|
gnu/packages/patches/lua52-liblua-so.patch \
|
||||||
gnu/packages/patches/luajit-no_ldconfig.patch \
|
gnu/packages/patches/luajit-no_ldconfig.patch \
|
||||||
gnu/packages/patches/luajit-symlinks.patch \
|
gnu/packages/patches/luajit-symlinks.patch \
|
||||||
gnu/packages/patches/luit-posix.patch \
|
gnu/packages/patches/luit-posix.patch \
|
||||||
|
|
@ -556,16 +574,23 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/make-impure-dirs.patch \
|
gnu/packages/patches/make-impure-dirs.patch \
|
||||||
gnu/packages/patches/mars-install.patch \
|
gnu/packages/patches/mars-install.patch \
|
||||||
gnu/packages/patches/mars-sfml-2.3.patch \
|
gnu/packages/patches/mars-sfml-2.3.patch \
|
||||||
|
gnu/packages/patches/matplotlib-setupext-tk.patch \
|
||||||
gnu/packages/patches/maxima-defsystem-mkdir.patch \
|
gnu/packages/patches/maxima-defsystem-mkdir.patch \
|
||||||
gnu/packages/patches/mc-fix-ncurses-build.patch \
|
gnu/packages/patches/mc-fix-ncurses-build.patch \
|
||||||
gnu/packages/patches/mcron-install.patch \
|
gnu/packages/patches/mcron-install.patch \
|
||||||
gnu/packages/patches/mdadm-gcc-4.9-fix.patch \
|
gnu/packages/patches/mdadm-gcc-4.9-fix.patch \
|
||||||
gnu/packages/patches/mhash-keygen-test-segfault.patch \
|
gnu/packages/patches/mhash-keygen-test-segfault.patch \
|
||||||
gnu/packages/patches/mit-krb5-init-fix.patch \
|
gnu/packages/patches/mit-krb5-CVE-2015-2695-pt1.patch \
|
||||||
|
gnu/packages/patches/mit-krb5-CVE-2015-2695-pt2.patch \
|
||||||
|
gnu/packages/patches/mit-krb5-CVE-2015-2696.patch \
|
||||||
|
gnu/packages/patches/mit-krb5-CVE-2015-2697.patch \
|
||||||
|
gnu/packages/patches/mit-krb5-CVE-2015-2698-pt1.patch \
|
||||||
|
gnu/packages/patches/mit-krb5-CVE-2015-2698-pt2.patch \
|
||||||
gnu/packages/patches/mpc123-initialize-ao.patch \
|
gnu/packages/patches/mpc123-initialize-ao.patch \
|
||||||
gnu/packages/patches/mplayer2-theora-fix.patch \
|
gnu/packages/patches/mplayer2-theora-fix.patch \
|
||||||
gnu/packages/patches/module-init-tools-moduledir.patch \
|
gnu/packages/patches/module-init-tools-moduledir.patch \
|
||||||
gnu/packages/patches/mumps-build-parallelism.patch \
|
gnu/packages/patches/mumps-build-parallelism.patch \
|
||||||
|
gnu/packages/patches/mupen64plus-ui-console-notice.patch \
|
||||||
gnu/packages/patches/mupdf-buildsystem-fix.patch \
|
gnu/packages/patches/mupdf-buildsystem-fix.patch \
|
||||||
gnu/packages/patches/mutt-store-references.patch \
|
gnu/packages/patches/mutt-store-references.patch \
|
||||||
gnu/packages/patches/net-tools-bitrot.patch \
|
gnu/packages/patches/net-tools-bitrot.patch \
|
||||||
|
|
@ -601,8 +626,6 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/plotutils-libpng-jmpbuf.patch \
|
gnu/packages/patches/plotutils-libpng-jmpbuf.patch \
|
||||||
gnu/packages/patches/polkit-drop-test.patch \
|
gnu/packages/patches/polkit-drop-test.patch \
|
||||||
gnu/packages/patches/portaudio-audacity-compat.patch \
|
gnu/packages/patches/portaudio-audacity-compat.patch \
|
||||||
gnu/packages/patches/preseq-1.0.2-install-to-PREFIX.patch \
|
|
||||||
gnu/packages/patches/preseq-1.0.2-link-with-libbam.patch \
|
|
||||||
gnu/packages/patches/pt-scotch-build-parallelism.patch \
|
gnu/packages/patches/pt-scotch-build-parallelism.patch \
|
||||||
gnu/packages/patches/pulseaudio-fix-mult-test.patch \
|
gnu/packages/patches/pulseaudio-fix-mult-test.patch \
|
||||||
gnu/packages/patches/pulseaudio-longer-test-timeout.patch \
|
gnu/packages/patches/pulseaudio-longer-test-timeout.patch \
|
||||||
|
|
@ -610,20 +633,26 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/pybugz-encode-error.patch \
|
gnu/packages/patches/pybugz-encode-error.patch \
|
||||||
gnu/packages/patches/pybugz-stty.patch \
|
gnu/packages/patches/pybugz-stty.patch \
|
||||||
gnu/packages/patches/pyqt-configure.patch \
|
gnu/packages/patches/pyqt-configure.patch \
|
||||||
|
gnu/packages/patches/python-2-deterministic-build-info.patch \
|
||||||
gnu/packages/patches/python-2.7-search-paths.patch \
|
gnu/packages/patches/python-2.7-search-paths.patch \
|
||||||
|
gnu/packages/patches/python-2.7-source-date-epoch.patch \
|
||||||
|
gnu/packages/patches/python-3-deterministic-build-info.patch \
|
||||||
gnu/packages/patches/python-3-search-paths.patch \
|
gnu/packages/patches/python-3-search-paths.patch \
|
||||||
gnu/packages/patches/python-disable-ssl-test.patch \
|
gnu/packages/patches/python-disable-ssl-test.patch \
|
||||||
gnu/packages/patches/python-fix-tests.patch \
|
gnu/packages/patches/python-fix-tests.patch \
|
||||||
gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
|
gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
|
||||||
|
gnu/packages/patches/python-configobj-setuptools.patch \
|
||||||
gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
|
gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
|
||||||
gnu/packages/patches/qemu-CVE-2015-6855.patch \
|
gnu/packages/patches/qemu-CVE-2015-6855.patch \
|
||||||
gnu/packages/patches/qt4-ldflags.patch \
|
gnu/packages/patches/qt4-ldflags.patch \
|
||||||
gnu/packages/patches/ratpoison-shell.patch \
|
gnu/packages/patches/ratpoison-shell.patch \
|
||||||
gnu/packages/patches/readline-link-ncurses.patch \
|
gnu/packages/patches/readline-link-ncurses.patch \
|
||||||
gnu/packages/patches/ripperx-missing-file.patch \
|
gnu/packages/patches/ripperx-missing-file.patch \
|
||||||
|
gnu/packages/patches/rsem-makefile.patch \
|
||||||
gnu/packages/patches/sed-hurd-path-max.patch \
|
gnu/packages/patches/sed-hurd-path-max.patch \
|
||||||
gnu/packages/patches/scheme48-tests.patch \
|
gnu/packages/patches/scheme48-tests.patch \
|
||||||
gnu/packages/patches/scotch-test-threading.patch \
|
gnu/packages/patches/scotch-test-threading.patch \
|
||||||
|
gnu/packages/patches/scribus-qobject.patch \
|
||||||
gnu/packages/patches/sdl-libx11-1.6.patch \
|
gnu/packages/patches/sdl-libx11-1.6.patch \
|
||||||
gnu/packages/patches/serf-comment-style-fix.patch \
|
gnu/packages/patches/serf-comment-style-fix.patch \
|
||||||
gnu/packages/patches/serf-deflate-buckets-test-fix.patch \
|
gnu/packages/patches/serf-deflate-buckets-test-fix.patch \
|
||||||
|
|
@ -632,12 +661,17 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/slim-sigusr1.patch \
|
gnu/packages/patches/slim-sigusr1.patch \
|
||||||
gnu/packages/patches/soprano-find-clucene.patch \
|
gnu/packages/patches/soprano-find-clucene.patch \
|
||||||
gnu/packages/patches/superlu-dist-scotchmetis.patch \
|
gnu/packages/patches/superlu-dist-scotchmetis.patch \
|
||||||
|
gnu/packages/patches/synfig-build-fix.patch \
|
||||||
gnu/packages/patches/tar-d_ino_in_dirent-fix.patch \
|
gnu/packages/patches/tar-d_ino_in_dirent-fix.patch \
|
||||||
gnu/packages/patches/tar-skip-unreliable-tests.patch \
|
gnu/packages/patches/tar-skip-unreliable-tests.patch \
|
||||||
|
gnu/packages/patches/tcl-mkindex-deterministic.patch \
|
||||||
gnu/packages/patches/tcsh-fix-autotest.patch \
|
gnu/packages/patches/tcsh-fix-autotest.patch \
|
||||||
gnu/packages/patches/texi2html-document-encoding.patch \
|
gnu/packages/patches/texi2html-document-encoding.patch \
|
||||||
gnu/packages/patches/texi2html-i18n.patch \
|
gnu/packages/patches/texi2html-i18n.patch \
|
||||||
gnu/packages/patches/tidy-CVE-2015-5522+5523.patch \
|
gnu/packages/patches/tidy-CVE-2015-5522+5523.patch \
|
||||||
|
gnu/packages/patches/tinyxml-use-stl.patch \
|
||||||
|
gnu/packages/patches/tk-find-library.patch \
|
||||||
|
gnu/packages/patches/torsocks-dns-test.patch \
|
||||||
gnu/packages/patches/tvtime-gcc41.patch \
|
gnu/packages/patches/tvtime-gcc41.patch \
|
||||||
gnu/packages/patches/tvtime-pngoutput.patch \
|
gnu/packages/patches/tvtime-pngoutput.patch \
|
||||||
gnu/packages/patches/tvtime-videodev2.patch \
|
gnu/packages/patches/tvtime-videodev2.patch \
|
||||||
|
|
@ -662,12 +696,17 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/vtk-mesa-10.patch \
|
gnu/packages/patches/vtk-mesa-10.patch \
|
||||||
gnu/packages/patches/w3m-fix-compile.patch \
|
gnu/packages/patches/w3m-fix-compile.patch \
|
||||||
gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch \
|
gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch \
|
||||||
|
gnu/packages/patches/weechat-python.patch \
|
||||||
gnu/packages/patches/weex-vacopy.patch \
|
gnu/packages/patches/weex-vacopy.patch \
|
||||||
gnu/packages/patches/wicd-bitrate-none-fix.patch \
|
gnu/packages/patches/wicd-bitrate-none-fix.patch \
|
||||||
gnu/packages/patches/wicd-get-selected-profile-fix.patch \
|
gnu/packages/patches/wicd-get-selected-profile-fix.patch \
|
||||||
gnu/packages/patches/wicd-template-instantiation.patch \
|
gnu/packages/patches/wicd-template-instantiation.patch \
|
||||||
gnu/packages/patches/wicd-urwid-1.3.patch \
|
gnu/packages/patches/wicd-urwid-1.3.patch \
|
||||||
gnu/packages/patches/wmctrl-64-fix.patch \
|
gnu/packages/patches/wmctrl-64-fix.patch \
|
||||||
|
gnu/packages/patches/wpa-supplicant-CVE-2015-5310.patch \
|
||||||
|
gnu/packages/patches/wpa-supplicant-CVE-2015-5314.patch \
|
||||||
|
gnu/packages/patches/wpa-supplicant-CVE-2015-5315.patch \
|
||||||
|
gnu/packages/patches/wpa-supplicant-CVE-2015-5316.patch \
|
||||||
gnu/packages/patches/xf86-video-ark-remove-mibstore.patch \
|
gnu/packages/patches/xf86-video-ark-remove-mibstore.patch \
|
||||||
gnu/packages/patches/xf86-video-ast-remove-mibstore.patch \
|
gnu/packages/patches/xf86-video-ast-remove-mibstore.patch \
|
||||||
gnu/packages/patches/xf86-video-geode-glibc-2.20.patch \
|
gnu/packages/patches/xf86-video-geode-glibc-2.20.patch \
|
||||||
|
|
@ -688,6 +727,7 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/xf86-video-trident-remove-mibstore.patch \
|
gnu/packages/patches/xf86-video-trident-remove-mibstore.patch \
|
||||||
gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch \
|
gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch \
|
||||||
gnu/packages/patches/xfce4-panel-plugins.patch \
|
gnu/packages/patches/xfce4-panel-plugins.patch \
|
||||||
|
gnu/packages/patches/xfce4-session-fix-xflock4.patch \
|
||||||
gnu/packages/patches/xfce4-settings-defaults.patch \
|
gnu/packages/patches/xfce4-settings-defaults.patch \
|
||||||
gnu/packages/patches/xmodmap-asprintf.patch \
|
gnu/packages/patches/xmodmap-asprintf.patch \
|
||||||
gnu/packages/patches/zathura-plugindir-environment-variable.patch
|
gnu/packages/patches/zathura-plugindir-environment-variable.patch
|
||||||
|
|
|
||||||
2
gnu.scm
2
gnu.scm
|
|
@ -34,7 +34,7 @@
|
||||||
'((gnu system)
|
'((gnu system)
|
||||||
(gnu system file-systems)
|
(gnu system file-systems)
|
||||||
(gnu system grub) ; 'grub-configuration'
|
(gnu system grub) ; 'grub-configuration'
|
||||||
(gnu system linux) ; 'base-pam-services'
|
(gnu system pam)
|
||||||
(gnu system shadow) ; 'user-account'
|
(gnu system shadow) ; 'user-account'
|
||||||
(gnu system linux-initrd)
|
(gnu system linux-initrd)
|
||||||
(gnu system nss)
|
(gnu system nss)
|
||||||
|
|
|
||||||
|
|
@ -19,16 +19,36 @@
|
||||||
(define-module (gnu build linux-container)
|
(define-module (gnu build linux-container)
|
||||||
#:use-module (ice-9 format)
|
#:use-module (ice-9 format)
|
||||||
#:use-module (ice-9 match)
|
#:use-module (ice-9 match)
|
||||||
|
#:use-module (ice-9 rdelim)
|
||||||
#:use-module (srfi srfi-98)
|
#:use-module (srfi srfi-98)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
#:use-module (guix build utils)
|
#:use-module (guix build utils)
|
||||||
#:use-module (guix build syscalls)
|
#:use-module (guix build syscalls)
|
||||||
#:use-module ((gnu build file-systems) #:select (mount-file-system))
|
#:use-module ((gnu build file-systems) #:select (mount-file-system))
|
||||||
#:export (%namespaces
|
#:export (user-namespace-supported?
|
||||||
|
unprivileged-user-namespace-supported?
|
||||||
|
setgroups-supported?
|
||||||
|
%namespaces
|
||||||
run-container
|
run-container
|
||||||
call-with-container
|
call-with-container
|
||||||
container-excursion))
|
container-excursion))
|
||||||
|
|
||||||
|
(define (user-namespace-supported?)
|
||||||
|
"Return #t if user namespaces are supported on this system."
|
||||||
|
(file-exists? "/proc/self/ns/user"))
|
||||||
|
|
||||||
|
(define (unprivileged-user-namespace-supported?)
|
||||||
|
"Return #t if user namespaces can be created by unprivileged users."
|
||||||
|
(let ((userns-file "/proc/sys/kernel/unprivileged_userns_clone"))
|
||||||
|
(if (file-exists? userns-file)
|
||||||
|
(string=? "1" (call-with-input-file userns-file read-string))
|
||||||
|
#t)))
|
||||||
|
|
||||||
|
(define (setgroups-supported?)
|
||||||
|
"Return #t if the setgroups proc file, introduced in Linux-libre 3.19,
|
||||||
|
exists."
|
||||||
|
(file-exists? "/proc/self/setgroups"))
|
||||||
|
|
||||||
(define %namespaces
|
(define %namespaces
|
||||||
'(mnt pid ipc uts user net))
|
'(mnt pid ipc uts user net))
|
||||||
|
|
||||||
|
|
@ -165,7 +185,7 @@ host user identifiers to map into the user namespace."
|
||||||
"Return the number suitable for the 'flags' argument of 'clone' that
|
"Return the number suitable for the 'flags' argument of 'clone' that
|
||||||
corresponds to the symbols in NAMESPACES."
|
corresponds to the symbols in NAMESPACES."
|
||||||
;; Use the same flags as fork(3) in addition to the namespace flags.
|
;; Use the same flags as fork(3) in addition to the namespace flags.
|
||||||
(apply logior SIGCHLD CLONE_CHILD_CLEARTID CLONE_CHILD_SETTID
|
(apply logior SIGCHLD
|
||||||
(map (match-lambda
|
(map (match-lambda
|
||||||
('mnt CLONE_NEWNS)
|
('mnt CLONE_NEWNS)
|
||||||
('uts CLONE_NEWUTS)
|
('uts CLONE_NEWUTS)
|
||||||
|
|
|
||||||
|
|
@ -1,70 +0,0 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
|
||||||
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
|
|
||||||
;;;
|
|
||||||
;;; This file is part of GNU Guix.
|
|
||||||
;;;
|
|
||||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
||||||
;;; under the terms of the GNU General Public License as published by
|
|
||||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
||||||
;;; your option) any later version.
|
|
||||||
;;;
|
|
||||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
||||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
;;; GNU General Public License for more details.
|
|
||||||
;;;
|
|
||||||
;;; You should have received a copy of the GNU General Public License
|
|
||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
(define-module (gnu packages aarddict)
|
|
||||||
#:use-module ((guix licenses) #:select (gpl3))
|
|
||||||
#:use-module (guix packages)
|
|
||||||
#:use-module (guix download)
|
|
||||||
#:use-module (guix build-system python)
|
|
||||||
#:use-module (gnu packages python)
|
|
||||||
#:use-module (gnu packages qt))
|
|
||||||
|
|
||||||
(define-public aarddict
|
|
||||||
(package
|
|
||||||
(name "aarddict")
|
|
||||||
(version "0.9.3")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (string-append "https://github.com/aarddict/desktop/archive/"
|
|
||||||
version ".tar.gz"))
|
|
||||||
(file-name (string-append name "-" version ".tar.gz"))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"12h7m0z7nd7rg8avpi9syd265k0rhh4vbdh464nq0jzdg8m9p28c"))))
|
|
||||||
(build-system python-build-system)
|
|
||||||
(inputs
|
|
||||||
`(("python2-pyicu" ,python2-pyicu)
|
|
||||||
("python2-pyqt-4" ,python2-pyqt-4)
|
|
||||||
("python2-setuptools" ,python2-setuptools)
|
|
||||||
("python2-simplejson" ,python2-simplejson)
|
|
||||||
("python2-sip" ,python2-sip)))
|
|
||||||
(arguments
|
|
||||||
`(#:python ,python-2 ; incompatible with Python 3
|
|
||||||
#:phases
|
|
||||||
(alist-cons-before
|
|
||||||
'build 'configure
|
|
||||||
;; Force data into the output instead of the python package.
|
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
(let ((out (assoc-ref outputs "out")))
|
|
||||||
(substitute* "setup.py"
|
|
||||||
(("sys.prefix") (string-append "'" out "'")))))
|
|
||||||
%standard-phases)))
|
|
||||||
(home-page "http://aarddict.org/index.html")
|
|
||||||
(synopsis
|
|
||||||
"Dictionary program and offline Wikipedia reader")
|
|
||||||
(description
|
|
||||||
"Aard Dictionary is a free, fast, easy to use word lookup program that
|
|
||||||
looks up words fast even with huge dictionaries like English Wikipedia;
|
|
||||||
looks up words in multiple dictionaries in multiple languages without
|
|
||||||
switching;
|
|
||||||
works great as offline Wikipedia reader;
|
|
||||||
is keyboard navigation friendly;
|
|
||||||
has efficient, highly compressed dictionary data storage format with
|
|
||||||
ability to verify data integrity built-in.")
|
|
||||||
(license gpl3)))
|
|
||||||
|
|
@ -485,14 +485,14 @@ tools: server, client, and relay agent.")
|
||||||
(define-public libpcap
|
(define-public libpcap
|
||||||
(package
|
(package
|
||||||
(name "libpcap")
|
(name "libpcap")
|
||||||
(version "1.5.3")
|
(version "1.7.4")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://www.tcpdump.org/release/libpcap-"
|
(uri (string-append "http://www.tcpdump.org/release/libpcap-"
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"14wyjywrdi1ikaj6yc9c72m6m2r64z94lb0gm7k1a3q6q5cj3scs"))))
|
"1c28ykkizd7jqgzrfkg7ivqjlqs9p6lygp26bsw2i0z8hwhi3lvs"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs `(("bison" ,bison) ("flex" ,flex)))
|
(native-inputs `(("bison" ,bison) ("flex" ,flex)))
|
||||||
(arguments '(#:configure-flags '("--with-pcap=linux")
|
(arguments '(#:configure-flags '("--with-pcap=linux")
|
||||||
|
|
@ -510,14 +510,14 @@ network statistics collection, security monitoring, network debugging, etc.")
|
||||||
(define-public tcpdump
|
(define-public tcpdump
|
||||||
(package
|
(package
|
||||||
(name "tcpdump")
|
(name "tcpdump")
|
||||||
(version "4.5.1")
|
(version "4.7.4")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://www.tcpdump.org/release/tcpdump-"
|
(uri (string-append "http://www.tcpdump.org/release/tcpdump-"
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"15hb7zkzd66nag102qbv100hcnf7frglbkylmr8adwr8f5jkkaql"))))
|
"1byr8w6grk08fsq0444jmcz9ar89lq9nf4mjq2cny0w9k8k21rbb"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs `(("libpcap" ,libpcap)
|
(inputs `(("libpcap" ,libpcap)
|
||||||
("openssl" ,openssl)))
|
("openssl" ,openssl)))
|
||||||
|
|
@ -647,7 +647,7 @@ system administrator.")
|
||||||
(define-public sudo
|
(define-public sudo
|
||||||
(package
|
(package
|
||||||
(name "sudo")
|
(name "sudo")
|
||||||
(version "1.8.10p3")
|
(version "1.8.15")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri
|
(uri
|
||||||
|
|
@ -657,22 +657,35 @@ system administrator.")
|
||||||
version ".tar.gz")))
|
version ".tar.gz")))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"002l6h27pnhb77b65frhazbhknsxvrsnkpi43j7i0qw1lrgi7nkf"))))
|
"0263gi6i19fyzzc488n0qw3m518i39f6a7qmrfvahk9j10bkh5j3"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags '("--with-logpath=/var/log/sudo.log"
|
`(#:configure-flags
|
||||||
"--with-rundir=/run/sudo"
|
(list "--with-logpath=/var/log/sudo.log"
|
||||||
"--with-vardir=/var/db/sudo"
|
"--with-rundir=/run/sudo"
|
||||||
"--with-iologdir=/var/log/sudo-io")
|
"--with-vardir=/var/db/sudo"
|
||||||
|
"--with-iologdir=/var/log/sudo-io"
|
||||||
|
|
||||||
|
;; 'visudo.c' expects _PATH_MV to be defined, but glibc doesn't
|
||||||
|
;; provide it.
|
||||||
|
(string-append "CPPFLAGS=-D_PATH_MV='\""
|
||||||
|
(assoc-ref %build-inputs "coreutils")
|
||||||
|
"/bin/mv\"'"))
|
||||||
|
|
||||||
|
;; Avoid non-determinism; see <http://bugs.gnu.org/21918>.
|
||||||
|
#:parallel-build? #f
|
||||||
|
|
||||||
#:phases (alist-cons-before
|
#:phases (alist-cons-before
|
||||||
'configure 'pre-configure
|
'configure 'pre-configure
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "configure"
|
(substitute* "src/sudo_usage.h.in"
|
||||||
;; Refer to the right executables.
|
;; Do not capture 'configure' arguments since we would
|
||||||
(("/usr/bin/mv") (which "mv"))
|
;; unduly retain references, and also because the
|
||||||
(("/usr/bin/sh") (which "sh")))
|
;; CPPFLAGS above would close the string literal
|
||||||
|
;; prematurely.
|
||||||
|
(("@CONFIGURE_ARGS@") "\"\""))
|
||||||
(substitute* (find-files "." "Makefile\\.in")
|
(substitute* (find-files "." "Makefile\\.in")
|
||||||
(("-O [[:graph:]]+ -G [[:graph:]]+")
|
(("-o [[:graph:]]+ -g [[:graph:]]+")
|
||||||
;; Allow installation as non-root.
|
;; Allow installation as non-root.
|
||||||
"")
|
"")
|
||||||
(("^install: (.*)install-sudoers(.*)" _ before after)
|
(("^install: (.*)install-sudoers(.*)" _ before after)
|
||||||
|
|
@ -716,7 +729,12 @@ commands and their arguments.")
|
||||||
".tar.gz"))
|
".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"05mkp5bx1c3z7h5biddsv0p49gkrq9ksany3anp4wdiv92p5prfc"))))
|
"05mkp5bx1c3z7h5biddsv0p49gkrq9ksany3anp4wdiv92p5prfc"))
|
||||||
|
(patches
|
||||||
|
(map search-patch '("wpa-supplicant-CVE-2015-5310.patch"
|
||||||
|
"wpa-supplicant-CVE-2015-5314.patch"
|
||||||
|
"wpa-supplicant-CVE-2015-5315.patch"
|
||||||
|
"wpa-supplicant-CVE-2015-5316.patch")))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:phases (alist-replace
|
'(#:phases (alist-replace
|
||||||
|
|
|
||||||
|
|
@ -33,9 +33,10 @@
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnu/barcode/barcode-"
|
(uri (string-append "mirror://gnu/barcode/barcode-"
|
||||||
version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
(sha256 (base32
|
(sha256
|
||||||
"1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8"))))
|
(base32
|
||||||
|
"1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(synopsis "Convert text strings to printed bars in various standards")
|
(synopsis "Convert text strings to printed bars in various standards")
|
||||||
(description "GNU Barcode is a flexible tool to produce printed barcodes
|
(description "GNU Barcode is a flexible tool to produce printed barcodes
|
||||||
|
|
@ -53,7 +54,7 @@ formats.")
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
"http://fukuchi.org/works/qrencode/qrencode-" version
|
"http://fukuchi.org/works/qrencode/qrencode-" version
|
||||||
".tar.bz2"))
|
".tar.bz2"))
|
||||||
(sha256 (base32
|
(sha256 (base32
|
||||||
"163sb580p570p27imc6jhkfdw15kzp8vy1jq92nip1rwa63i9myz"))))
|
"163sb580p570p27imc6jhkfdw15kzp8vy1jq92nip1rwa63i9myz"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages readline)
|
#:use-module (gnu packages readline)
|
||||||
#:use-module (gnu packages flex)
|
#:use-module (gnu packages flex)
|
||||||
|
#:use-module (gnu packages xorg)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
|
|
@ -114,7 +115,7 @@ solve the shortest vector problem.")
|
||||||
(define-public pari-gp
|
(define-public pari-gp
|
||||||
(package
|
(package
|
||||||
(name "pari-gp")
|
(name "pari-gp")
|
||||||
(version "2.7.4")
|
(version "2.7.5")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -122,9 +123,10 @@ solve the shortest vector problem.")
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0k1qqagfl6zn7gvwmsqffj6g9yrzqvszwh2mblhmxpjlw1pigfh8"))))
|
"0c8l83a0gjq73r9hndsrzkypwxvnnm4pxkkzbg6jm95m80nzwh11"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs `(("gmp" ,gmp)
|
(inputs `(("gmp" ,gmp)
|
||||||
|
("libx11" ,libx11)
|
||||||
("perl" ,perl)
|
("perl" ,perl)
|
||||||
("readline" ,readline)))
|
("readline" ,readline)))
|
||||||
(arguments
|
(arguments
|
||||||
|
|
@ -155,7 +157,7 @@ PARI is also available as a C library to allow for faster computations.")
|
||||||
(define-public gp2c
|
(define-public gp2c
|
||||||
(package
|
(package
|
||||||
(name "gp2c")
|
(name "gp2c")
|
||||||
(version "0.0.9pl3")
|
(version "0.0.9pl4")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -163,7 +165,7 @@ PARI is also available as a C library to allow for faster computations.")
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0wbghihwlcx3w4j1la3bjf5gcrkk6lp9syw6iimqndq1f73ijlq3"))))
|
"079qq4yyxpc53a2kn08gg9pcfgdyffbl14c2hqsic11q8pnsr08z"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs `(("perl" ,perl)))
|
(native-inputs `(("perl" ,perl)))
|
||||||
(inputs `(("pari-gp" ,pari-gp)))
|
(inputs `(("pari-gp" ,pari-gp)))
|
||||||
|
|
@ -381,14 +383,15 @@ cosine/ sine transforms or DCT/DST).")
|
||||||
(define-public eigen
|
(define-public eigen
|
||||||
(package
|
(package
|
||||||
(name "eigen")
|
(name "eigen")
|
||||||
(version "3.2.6")
|
(version "3.2.7")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://bitbucket.org/eigen/eigen/get/"
|
(uri (string-append "https://bitbucket.org/eigen/eigen/get/"
|
||||||
version ".tar.bz2"))
|
version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0gil5ksmgcg6v3nw0v613mvpzz4n33xhawqs8l7fj7rnlpwm4cwa"))
|
"0gigbjjdlw2q0gvcnyiwc6in314a647rkidk6977bwiwn88im3p5"))
|
||||||
|
(file-name (string-append name "-" version ".tar.bz2"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
;; There are 3 test failures in the "unsupported" directory,
|
;; There are 3 test failures in the "unsupported" directory,
|
||||||
|
|
@ -396,29 +399,28 @@ cosine/ sine transforms or DCT/DST).")
|
||||||
;; anyway, so just skip them.
|
;; anyway, so just skip them.
|
||||||
'(substitute* "CMakeLists.txt"
|
'(substitute* "CMakeLists.txt"
|
||||||
(("add_subdirectory\\(unsupported\\)")
|
(("add_subdirectory\\(unsupported\\)")
|
||||||
"# Do not build the tests for unsupported features.\n")))))
|
"# Do not build the tests for unsupported features.\n")
|
||||||
|
;; Work around
|
||||||
|
;; <http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1114>.
|
||||||
|
(("\"include/eigen3\"")
|
||||||
|
"\"${CMAKE_INSTALL_PREFIX}/include/eigen3\"")))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(;; Turn off debugging symbols to save space.
|
'(;; Turn off debugging symbols to save space.
|
||||||
#:build-type "Release"
|
#:build-type "Release"
|
||||||
|
|
||||||
;; Use 'make check', as per
|
#:phases (modify-phases %standard-phases
|
||||||
;; <http://eigen.tuxfamily.org/index.php?title=Tests>.
|
(replace 'check
|
||||||
#:test-target "check"
|
(lambda _
|
||||||
|
(let* ((cores (parallel-job-count))
|
||||||
|
(dash-j (format #f "-j~a" cores)))
|
||||||
|
;; First build the tests, in parallel. See
|
||||||
|
;; <http://eigen.tuxfamily.org/index.php?title=Tests>.
|
||||||
|
(and (zero? (system* "make" "buildtests" dash-j))
|
||||||
|
|
||||||
#:phases (alist-cons-before
|
;; Then run 'CTest' with -V so we get more
|
||||||
'check 'build-tests
|
;; details upon failure.
|
||||||
(lambda _
|
(zero? (system* "ctest" "-V" dash-j)))))))))
|
||||||
;; First build the tests, in parallel.
|
|
||||||
;; See <http://eigen.tuxfamily.org/index.php?title=Tests>.
|
|
||||||
(let* ((cores (parallel-job-count))
|
|
||||||
(dash-j (format #f "-j~a" cores)))
|
|
||||||
;; These variables are supposed to be honored.
|
|
||||||
(setenv "EIGEN_MAKE_ARGS" dash-j)
|
|
||||||
(setenv "EIGEN_CTEST_ARGS" dash-j)
|
|
||||||
|
|
||||||
(zero? (system* "make" "buildtests" dash-j))))
|
|
||||||
%standard-phases)))
|
|
||||||
(home-page "http://eigen.tuxfamily.org")
|
(home-page "http://eigen.tuxfamily.org")
|
||||||
(synopsis "C++ template library for linear algebra")
|
(synopsis "C++ template library for linear algebra")
|
||||||
(description
|
(description
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,178 @@
|
||||||
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
|
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||||
|
;;;
|
||||||
|
;;; This file is part of GNU Guix.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||||
|
;;; under the terms of the GNU General Public License as published by
|
||||||
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||||
|
;;; your option) any later version.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||||
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
;;; GNU General Public License for more details.
|
||||||
|
;;;
|
||||||
|
;;; You should have received a copy of the GNU General Public License
|
||||||
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
(define-module (gnu packages animation)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix utils)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (gnu packages)
|
||||||
|
#:use-module (gnu packages boost)
|
||||||
|
#:use-module (gnu packages compression)
|
||||||
|
#:use-module (gnu packages fontutils)
|
||||||
|
#:use-module (gnu packages glib)
|
||||||
|
#:use-module (gnu packages gnome)
|
||||||
|
#:use-module (gnu packages graphics)
|
||||||
|
#:use-module (gnu packages gtk)
|
||||||
|
#:use-module (gnu packages image)
|
||||||
|
#:use-module (gnu packages imagemagick)
|
||||||
|
#:use-module (gnu packages pkg-config)
|
||||||
|
#:use-module (gnu packages video))
|
||||||
|
|
||||||
|
(define-public etl
|
||||||
|
(package
|
||||||
|
(name "etl")
|
||||||
|
(version "0.04.19")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
;; Keep this synchronized with the synfig release version.
|
||||||
|
(uri (string-append "mirror://sourceforge/synfig/releases/"
|
||||||
|
"1.0.2/source/ETL-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"070c70slizrklq1gbgja8m49xfmq65wlcd6hz6418cpx0wd4r55s"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(home-page "http://www.synfig.org")
|
||||||
|
(synopsis "Extended C++ template library")
|
||||||
|
(description
|
||||||
|
"ETL is a class and template library designed to add new datatypes and
|
||||||
|
functions which combine well with the existing types and functions from the
|
||||||
|
C++ @dfn{Standard Template Library} (STL).")
|
||||||
|
(license license:gpl3+)))
|
||||||
|
|
||||||
|
(define-public synfig
|
||||||
|
(package
|
||||||
|
(name "synfig")
|
||||||
|
(version "1.0.2")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "mirror://sourceforge/synfig/releases/"
|
||||||
|
version "/source/synfig-" version
|
||||||
|
".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1d3z2r78j3rkff47q3wl0ami69y3l4nyi5r9zclymb8ar7mgkk9l"))
|
||||||
|
(patches (list (search-patch "synfig-build-fix.patch")))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
`(#:configure-flags
|
||||||
|
;; The Boost library path is taken from the value of BOOST_LDFLAGS.
|
||||||
|
(list (string-append "BOOST_LDFLAGS=-L"
|
||||||
|
(assoc-ref %build-inputs "boost")
|
||||||
|
"/lib"))
|
||||||
|
#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'adapt-to-libxml++-changes
|
||||||
|
(lambda _
|
||||||
|
(substitute* "configure"
|
||||||
|
(("libxml\\+\\+-2\\.6") "libxml++-3.0"))
|
||||||
|
(substitute* (append (find-files "src/modules/" "\\.cpp$")
|
||||||
|
(find-files "src/synfig/" "\\.(cpp|h)$"))
|
||||||
|
(("add_child\\(") "add_child_element(")
|
||||||
|
(("get_child_text\\(") "get_first_child_text(")
|
||||||
|
(("set_child_text\\(") "set_first_child_text(")
|
||||||
|
(("remove_child\\(") "remove_node("))
|
||||||
|
(substitute* "src/modules/mod_svg/svg_parser.cpp"
|
||||||
|
(("xmlpp::Node::NodeList") "xmlpp::Node::const_NodeList"))
|
||||||
|
#t))
|
||||||
|
(add-before 'configure 'set-flags
|
||||||
|
(lambda _
|
||||||
|
;; Compile with C++11, required by libsigc++.
|
||||||
|
(setenv "CXXFLAGS" "-D__STDC_CONSTANT_MACROS -std=gnu++11")
|
||||||
|
#t)))))
|
||||||
|
(inputs
|
||||||
|
`(("boost" ,boost)
|
||||||
|
("ffmpeg" ,ffmpeg)
|
||||||
|
("libdv" ,libdv)
|
||||||
|
("libjpeg" ,libjpeg)
|
||||||
|
("libpng" ,libpng)
|
||||||
|
("libmng" ,libmng)
|
||||||
|
("zlib" ,zlib)))
|
||||||
|
;; synfig.pc lists the following as required: Magick++ freetype2
|
||||||
|
;; fontconfig OpenEXR ETL glibmm-2.4 giomm-2.4 libxml++-3.0 sigc++-2.0
|
||||||
|
;; cairo pango pangocairo mlt++
|
||||||
|
(propagated-inputs
|
||||||
|
`(("cairo" ,cairo)
|
||||||
|
("etl" ,etl)
|
||||||
|
("fontconfig" ,fontconfig)
|
||||||
|
("freetype" ,freetype)
|
||||||
|
("glibmm" ,glibmm)
|
||||||
|
("imagemagick" ,imagemagick)
|
||||||
|
("libxml++" ,libxml++)
|
||||||
|
("libsigc++" ,libsigc++)
|
||||||
|
("mlt" ,mlt)
|
||||||
|
("openexr" ,openexr)
|
||||||
|
("pango" ,pango)))
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
(home-page "http://www.synfig.org")
|
||||||
|
(synopsis "Vector-based 2D animation renderer")
|
||||||
|
(description
|
||||||
|
"Synfig is a vector-based 2D animation package. It is designed to be
|
||||||
|
capable of producing feature-film quality animation. It eliminates the need
|
||||||
|
for tweening, preventing the need to hand-draw each frame.")
|
||||||
|
(license license:gpl3+)))
|
||||||
|
|
||||||
|
(define-public synfigstudio
|
||||||
|
(package
|
||||||
|
(name "synfigstudio")
|
||||||
|
(version "1.0.2")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "mirror://sourceforge/synfig/releases/"
|
||||||
|
version "/source/synfigstudio-" version
|
||||||
|
".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1xa74dlgkpjn0gzdcs0x25z7wg0806v2wygvvi73f7sn1fm88ig4"))
|
||||||
|
(modules '((guix build utils)))
|
||||||
|
(snippet
|
||||||
|
'(begin
|
||||||
|
(substitute* "src/synfigapp/pluginmanager.cpp"
|
||||||
|
(("xmlpp::Node\\* n =") "const xmlpp::Node* n =")
|
||||||
|
(("xmlpp::Node::NodeList") "xmlpp::Node::const_NodeList"))
|
||||||
|
;; Some files are ISO-8859-1 encoded.
|
||||||
|
(with-fluids ((%default-port-encoding #f))
|
||||||
|
(substitute* (find-files "src/" "\\.(cpp|h)$")
|
||||||
|
(("#include <sigc\\+\\+/retype\\.h>")
|
||||||
|
"#include <sigc++/adaptors/retype.h>")
|
||||||
|
(("#include <sigc\\+\\+/hide\\.h>")
|
||||||
|
"#include <sigc++/adaptors/hide.h>")
|
||||||
|
(("#include <sigc\\+\\+/object\\.h>")
|
||||||
|
"#include <sigc++/trackable.h>")))
|
||||||
|
#t))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
`(#:configure-flags
|
||||||
|
(list "CXXFLAGS=-std=gnu++11")))
|
||||||
|
(inputs
|
||||||
|
`(("gtkmm" ,gtkmm)
|
||||||
|
("libsigc++" ,libsigc++)
|
||||||
|
("synfig" ,synfig)))
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)
|
||||||
|
("intltool" ,intltool)))
|
||||||
|
(home-page "http://www.synfig.org")
|
||||||
|
(synopsis "Vector-based 2D animation package (GUI)")
|
||||||
|
(description
|
||||||
|
"Synfig is a vector-based 2D animation package. It is designed to
|
||||||
|
be capable of producing feature-film quality animation. It eliminates the
|
||||||
|
need for tweening, preventing the need to hand-draw each frame. This package
|
||||||
|
contains the graphical user interface for synfig.")
|
||||||
|
(license license:gpl3+)))
|
||||||
|
|
@ -0,0 +1,49 @@
|
||||||
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
|
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||||
|
;;;
|
||||||
|
;;; This file is part of GNU Guix.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||||
|
;;; under the terms of the GNU General Public License as published by
|
||||||
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||||
|
;;; your option) any later version.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||||
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
;;; GNU General Public License for more details.
|
||||||
|
;;;
|
||||||
|
;;; You should have received a copy of the GNU General Public License
|
||||||
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
(define-module (gnu packages aria2)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (gnu packages pkg-config))
|
||||||
|
|
||||||
|
(define-public c-ares
|
||||||
|
(package
|
||||||
|
(name "c-ares")
|
||||||
|
(version "1.10.0")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"http://c-ares.haxx.se/download/" name "-" version
|
||||||
|
".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1nyka87yf2jfd0y6sspll0yxwb8zi7kyvajrdbjmh4axc5s1cw1x"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
(home-page "http://c-ares.haxx.se/")
|
||||||
|
(synopsis "C library for asynchronous DNS requests")
|
||||||
|
(description
|
||||||
|
"C-ares is a C library that performs DNS requests and name resolution
|
||||||
|
asynchronously. It is intended for applications which need to perform DNS
|
||||||
|
queries without blocking, or need to perform multiple DNS queries in parallel.
|
||||||
|
The primary examples of such applications are servers which communicate with
|
||||||
|
multiple clients and programs with graphical user interfaces.")
|
||||||
|
(license (license:x11-style "http://c-ares.haxx.se/license.html"))))
|
||||||
|
|
@ -42,6 +42,8 @@
|
||||||
#:use-module (gnu packages databases)
|
#:use-module (gnu packages databases)
|
||||||
#:use-module (gnu packages file)
|
#:use-module (gnu packages file)
|
||||||
#:use-module (gnu packages flex)
|
#:use-module (gnu packages flex)
|
||||||
|
#:use-module (gnu packages fltk)
|
||||||
|
#:use-module (gnu packages fontutils)
|
||||||
#:use-module (gnu packages gettext)
|
#:use-module (gnu packages gettext)
|
||||||
#:use-module (gnu packages glib)
|
#:use-module (gnu packages glib)
|
||||||
#:use-module (gnu packages gtk)
|
#:use-module (gnu packages gtk)
|
||||||
|
|
@ -58,6 +60,7 @@
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
#:use-module (gnu packages rdf)
|
#:use-module (gnu packages rdf)
|
||||||
#:use-module (gnu packages readline)
|
#:use-module (gnu packages readline)
|
||||||
|
#:use-module (gnu packages webkit)
|
||||||
#:use-module (gnu packages xiph)
|
#:use-module (gnu packages xiph)
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (gnu packages xorg)
|
#:use-module (gnu packages xorg)
|
||||||
|
|
@ -128,7 +131,7 @@ Filter) modules follow the convention of 1V / Octave.")
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)))
|
`(("pkg-config" ,pkg-config)))
|
||||||
(home-page "http://aubio.org/")
|
(home-page "http://aubio.org/")
|
||||||
(synopsis "A library for audio labelling")
|
(synopsis "Library for audio labelling")
|
||||||
(description
|
(description
|
||||||
"aubio is a tool designed for the extraction of annotations from audio
|
"aubio is a tool designed for the extraction of annotations from audio
|
||||||
signals. Its features include segmenting a sound file before each of its
|
signals. Its features include segmenting a sound file before each of its
|
||||||
|
|
@ -152,13 +155,11 @@ streams from live audio.")
|
||||||
libdir "/vamp" "\"]"))))
|
libdir "/vamp" "\"]"))))
|
||||||
#t))
|
#t))
|
||||||
|
|
||||||
(define-public ardour-3
|
(define-public ardour
|
||||||
(package
|
(package
|
||||||
(name "ardour")
|
(name "ardour")
|
||||||
(version "3.5.403")
|
(version "4.4")
|
||||||
(source (origin
|
(source (origin
|
||||||
;; The project only provides tarballs upon individual request
|
|
||||||
;; (or after payment) so we take the code from git.
|
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "git://git.ardour.org/ardour/ardour.git")
|
(url "git://git.ardour.org/ardour/ardour.git")
|
||||||
|
|
@ -171,14 +172,15 @@ streams from live audio.")
|
||||||
"libs/ardour/revision.cc"
|
"libs/ardour/revision.cc"
|
||||||
(lambda (port)
|
(lambda (port)
|
||||||
(format port "#include \"ardour/revision.h\"
|
(format port "#include \"ardour/revision.h\"
|
||||||
namespace ARDOUR { const char* revision = \"3.5-403-gec2cb31\" ; }"))))
|
namespace ARDOUR { const char* revision = \"4.4-210-ga4daf93\" ; }"))))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"01b0wxh0wlxjfz5j8gcwwqhxc6q2kn4njz2fcmzv9fr3xaya5dbp"))
|
"1gnrcnq2ksnh7fsa301v1c4p5dqrbqpjylf02rg3za3ab58wxi7l"))
|
||||||
(file-name (string-append name "-" version))))
|
(file-name (string-append name "-" version))))
|
||||||
(build-system waf-build-system)
|
(build-system waf-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:configure-flags '("--cxx11") ; required by gtkmm
|
||||||
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after
|
(add-after
|
||||||
'unpack 'set-rpath-in-LDFLAGS
|
'unpack 'set-rpath-in-LDFLAGS
|
||||||
|
|
@ -230,35 +232,6 @@ record, edit, mix and master audio and MIDI projects. It is targeted at audio
|
||||||
engineers, musicians, soundtrack editors and composers.")
|
engineers, musicians, soundtrack editors and composers.")
|
||||||
(license license:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
(define-public ardour
|
|
||||||
(package (inherit ardour-3)
|
|
||||||
(name "ardour")
|
|
||||||
(version "4.2")
|
|
||||||
(source (origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "git://git.ardour.org/ardour/ardour.git")
|
|
||||||
(commit version)))
|
|
||||||
(snippet
|
|
||||||
;; Ardour expects this file to exist at build time. It can be
|
|
||||||
;; created from a git checkout with:
|
|
||||||
;; ./waf create_stored_revision
|
|
||||||
'(call-with-output-file
|
|
||||||
"libs/ardour/revision.cc"
|
|
||||||
(lambda (port)
|
|
||||||
(format port "#include \"ardour/revision.h\"
|
|
||||||
namespace ARDOUR { const char* revision = \"4.2\" ; }"))))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1j8zw0bvh16qwyy8qrqynpak9nghl9j3qhjjcdl7wh9raafjqc00"))
|
|
||||||
(file-name (string-append name "-" version))))
|
|
||||||
(arguments
|
|
||||||
(substitute-keyword-arguments (package-arguments ardour-3)
|
|
||||||
((#:phases phases)
|
|
||||||
`(modify-phases ,phases
|
|
||||||
(replace 'set-rpath-in-LDFLAGS
|
|
||||||
,(ardour-rpath-phase (version-prefix version 1)))))))))
|
|
||||||
|
|
||||||
(define-public azr3
|
(define-public azr3
|
||||||
(package
|
(package
|
||||||
(name "azr3")
|
(name "azr3")
|
||||||
|
|
@ -301,9 +274,8 @@ plugins are provided.")
|
||||||
(version "0.0.60")
|
(version "0.0.60")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append "http://calf-studio-gear.org/files/calf-"
|
||||||
"mirror://sourceforge/calf/calf/"
|
version ".tar.gz"))
|
||||||
version "/calf-" version ".tar.gz"))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"019fwg00jv217a5r767z7szh7vdrarybac0pr2sk26xp81kibrx9"))))
|
"019fwg00jv217a5r767z7szh7vdrarybac0pr2sk26xp81kibrx9"))))
|
||||||
|
|
@ -350,6 +322,12 @@ tools (analyzer, mono/stereo tools, crossovers).")
|
||||||
(base32
|
(base32
|
||||||
"0a1sni6lr7qpwywpggbkp0ia3h9bwwgf9i87gsag8ra2h30v82hd"))))
|
"0a1sni6lr7qpwywpggbkp0ia3h9bwwgf9i87gsag8ra2h30v82hd"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
|
(arguments
|
||||||
|
;; Work around this error on x86_64 with libc 2.22+:
|
||||||
|
;; libmvec.so.1: error adding symbols: DSO missing from command line
|
||||||
|
(if (string-prefix? "x86_64" (or (%current-target-system) (%current-system)))
|
||||||
|
'(#:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-lmvec"))
|
||||||
|
'()))
|
||||||
(inputs
|
(inputs
|
||||||
`(("alsa-lib" ,alsa-lib)
|
`(("alsa-lib" ,alsa-lib)
|
||||||
("boost" ,boost)
|
("boost" ,boost)
|
||||||
|
|
@ -558,7 +536,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
|
||||||
(define-public guitarix
|
(define-public guitarix
|
||||||
(package
|
(package
|
||||||
(name "guitarix")
|
(name "guitarix")
|
||||||
(version "0.33.0")
|
(version "0.34.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -566,7 +544,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
|
||||||
version ".tar.bz2"))
|
version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1w6dg2n0alfjsx1iy6s53783invygwxk11p1i65cc3nq3zlidcgx"))))
|
"0pamaq8iybsaglq6y1m1rlmz4wgbs2r6m24bj7x4fwg4grjvzjl8"))))
|
||||||
(build-system waf-build-system)
|
(build-system waf-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; no "check" target
|
`(#:tests? #f ; no "check" target
|
||||||
|
|
@ -574,7 +552,8 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
(list
|
(list
|
||||||
;; Add the output lib directory to the RUNPATH.
|
;; Add the output lib directory to the RUNPATH.
|
||||||
(string-append "--ldflags=-Wl,-rpath=" %output "/lib"))))
|
(string-append "--ldflags=-Wl,-rpath=" %output "/lib")
|
||||||
|
"--cxxflags=-std=c++11")))
|
||||||
(inputs
|
(inputs
|
||||||
`(("libsndfile" ,libsndfile)
|
`(("libsndfile" ,libsndfile)
|
||||||
("boost" ,boost)
|
("boost" ,boost)
|
||||||
|
|
@ -586,6 +565,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
|
||||||
("jack" ,jack-1)
|
("jack" ,jack-1)
|
||||||
("gtkmm" ,gtkmm-2)
|
("gtkmm" ,gtkmm-2)
|
||||||
("gtk+" ,gtk+-2)
|
("gtk+" ,gtk+-2)
|
||||||
|
("webkitgtk/gtk+-2" ,webkitgtk/gtk+-2)
|
||||||
("fftwf" ,fftwf)
|
("fftwf" ,fftwf)
|
||||||
("lrdf" ,lrdf)
|
("lrdf" ,lrdf)
|
||||||
("zita-resampler" ,zita-resampler)
|
("zita-resampler" ,zita-resampler)
|
||||||
|
|
@ -611,6 +591,56 @@ from a simple noise gate to modulation effects like flanger, phaser or
|
||||||
auto-wah.")
|
auto-wah.")
|
||||||
(license license:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public rakarrack
|
||||||
|
(package
|
||||||
|
(name "rakarrack")
|
||||||
|
(version "0.6.1")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "mirror://sourceforge/rakarrack/rakarrack/"
|
||||||
|
"rakarrack-" version "/rakarrack-"
|
||||||
|
version ".tar.bz2"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1rpf63pdn54c4yg13k7cb1w1c7zsvl97c4qxcpz41c8l91xd55kn"))
|
||||||
|
(modules '((guix build utils)))
|
||||||
|
(snippet
|
||||||
|
'(begin
|
||||||
|
(substitute* '("src/process.C"
|
||||||
|
"src/global.h")
|
||||||
|
(("#include <Fl/") "#include <FL/"))
|
||||||
|
#t))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(inputs
|
||||||
|
`(("alsa-utils" ,alsa-utils)
|
||||||
|
("fltk" ,fltk)
|
||||||
|
("libx11" ,libx11)
|
||||||
|
("libxext" ,libxext)
|
||||||
|
("libxfixes" ,libxfixes)
|
||||||
|
("libxft" ,libxft)
|
||||||
|
("libxrender" ,libxrender)
|
||||||
|
("libxpm" ,libxpm)
|
||||||
|
("fontconfig" ,fontconfig)
|
||||||
|
("freetype" ,freetype)
|
||||||
|
("jack" ,jack-1)
|
||||||
|
("alsa-lib" ,alsa-lib)
|
||||||
|
("libsndfile" ,libsndfile)
|
||||||
|
("libsamplerate" ,libsamplerate)
|
||||||
|
("zlib" ,zlib)))
|
||||||
|
(home-page "http://rakarrack.sourceforge.net/")
|
||||||
|
(synopsis "Audio effects processor")
|
||||||
|
(description
|
||||||
|
"Rakarrack is a richly featured multi-effects processor emulating a
|
||||||
|
guitar effects pedalboard. Effects include compressor, expander, noise gate,
|
||||||
|
equalizers, exciter, flangers, chorus, various delay and reverb effects,
|
||||||
|
distortion modules and many more. Most of the effects engine is built from
|
||||||
|
modules found in the excellent software synthesizer ZynAddSubFX. Presets and
|
||||||
|
user interface are optimized for guitar, but Rakarrack processes signals in
|
||||||
|
stereo while it does not apply internal band-limiting filtering, and thus is
|
||||||
|
well suited to all musical instruments and vocals.")
|
||||||
|
;; The code is explicitly licensed under the GPL version 2 only.
|
||||||
|
(license license:gpl2)))
|
||||||
|
|
||||||
(define-public ir
|
(define-public ir
|
||||||
(package
|
(package
|
||||||
(name "ir")
|
(name "ir")
|
||||||
|
|
@ -707,7 +737,8 @@ synchronous execution of all clients, and low latency operation.")
|
||||||
"03b0iiyk3ng3vh5s8gaqwn565vik7910p56mlbk512bw3dhbdwc8"))))
|
"03b0iiyk3ng3vh5s8gaqwn565vik7910p56mlbk512bw3dhbdwc8"))))
|
||||||
(build-system waf-build-system)
|
(build-system waf-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; no check target
|
`(#:python ,python-2
|
||||||
|
#:tests? #f ; no check target
|
||||||
#:configure-flags '("--dbus"
|
#:configure-flags '("--dbus"
|
||||||
"--alsa")
|
"--alsa")
|
||||||
#:phases
|
#:phases
|
||||||
|
|
@ -720,13 +751,22 @@ synchronous execution of all clients, and low latency operation.")
|
||||||
((".*CFLAGS.*-Wall.*" m)
|
((".*CFLAGS.*-Wall.*" m)
|
||||||
(string-append m
|
(string-append m
|
||||||
" conf.env.append_unique('LINKFLAGS',"
|
" conf.env.append_unique('LINKFLAGS',"
|
||||||
"'-Wl,-rpath=" %output "/lib')\n"))))))))
|
"'-Wl,-rpath=" %output "/lib')\n")))))
|
||||||
|
(add-after 'install 'wrap-python-scripts
|
||||||
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
|
;; Make sure 'jack_control' runs with the correct PYTHONPATH.
|
||||||
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
|
(path (getenv "PYTHONPATH")))
|
||||||
|
(wrap-program (string-append out "/bin/jack_control")
|
||||||
|
`("PYTHONPATH" ":" prefix (,path))))
|
||||||
|
#t)))))
|
||||||
(inputs
|
(inputs
|
||||||
`(("alsa-lib" ,alsa-lib)
|
`(("alsa-lib" ,alsa-lib)
|
||||||
("dbus" ,dbus)
|
("dbus" ,dbus)
|
||||||
("expat" ,expat)
|
("expat" ,expat)
|
||||||
("libsamplerate" ,libsamplerate)
|
("libsamplerate" ,libsamplerate)
|
||||||
("opus" ,opus)
|
("opus" ,opus)
|
||||||
|
("python2-dbus" ,python2-dbus)
|
||||||
("readline" ,readline)))
|
("readline" ,readline)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)))
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
|
@ -745,7 +785,16 @@ synchronous execution of all clients, and low latency operation.")
|
||||||
(base32
|
(base32
|
||||||
"1f1hcq74n3ziw8bk97mn5a1vgw028dxikv3fchaxd430pbbhqgl9"))))
|
"1f1hcq74n3ziw8bk97mn5a1vgw028dxikv3fchaxd430pbbhqgl9"))))
|
||||||
(build-system waf-build-system)
|
(build-system waf-build-system)
|
||||||
(arguments `(#:tests? #f)) ; no check target
|
(arguments
|
||||||
|
`(#:tests? #f ; no check target
|
||||||
|
#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(add-before
|
||||||
|
'configure 'set-flags
|
||||||
|
(lambda _
|
||||||
|
;; Compile with C++11, required by gtkmm.
|
||||||
|
(setenv "CXXFLAGS" "-std=c++11")
|
||||||
|
#t)))))
|
||||||
(inputs
|
(inputs
|
||||||
`(("lv2" ,lv2)
|
`(("lv2" ,lv2)
|
||||||
("lilv" ,lilv)
|
("lilv" ,lilv)
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013,2014 Eric Bavier <bavier@member.fsf.org>
|
;;; Copyright © 2013,2014 Eric Bavier <bavier@member.fsf.org>
|
||||||
|
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -30,16 +31,15 @@
|
||||||
(define-public autogen
|
(define-public autogen
|
||||||
(package
|
(package
|
||||||
(name "autogen")
|
(name "autogen")
|
||||||
(version "5.18.6")
|
(version "5.18.7")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnu/autogen/rel"
|
(uri (string-append "mirror://gnu/autogen"
|
||||||
version "/autogen-"
|
"/autogen-" version ".tar.xz"))
|
||||||
version ".tar.xz"))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0sfmmy19k9z0j3f738fyk6ljf6b66410cvd5zzyplxi2683j10qs"))))
|
"01d4m8ckww12sy50vgyxlnz83z9dxqpyqp153cscncc9w6jq19d7"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs `(("perl" ,perl) ;for doc generator mdoc
|
(native-inputs `(("perl" ,perl) ;for doc generator mdoc
|
||||||
("pkg-config" ,pkg-config)))
|
("pkg-config" ,pkg-config)))
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
#:use-module (gnu packages gdbm)
|
#:use-module (gnu packages databases)
|
||||||
#:use-module (gnu packages libdaemon)
|
#:use-module (gnu packages libdaemon)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages glib)
|
#:use-module (gnu packages glib)
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||||
|
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -17,12 +18,14 @@
|
||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages avr)
|
(define-module (gnu packages avr)
|
||||||
#:use-module (guix licenses)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
#:use-module (gnu packages cross-base))
|
#:use-module (gnu packages cross-base)
|
||||||
|
#:use-module (gnu packages vim)
|
||||||
|
#:use-module (gnu packages zip))
|
||||||
|
|
||||||
(define-public avr-libc
|
(define-public avr-libc
|
||||||
(package
|
(package
|
||||||
|
|
@ -48,4 +51,41 @@
|
||||||
(description
|
(description
|
||||||
"AVR Libc is a project whose goal is to provide a high quality C library
|
"AVR Libc is a project whose goal is to provide a high quality C library
|
||||||
for use with GCC on Atmel AVR microcontrollers.")
|
for use with GCC on Atmel AVR microcontrollers.")
|
||||||
(license (non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt"))))
|
(license (license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt"))))
|
||||||
|
|
||||||
|
(define-public microscheme
|
||||||
|
(package
|
||||||
|
(name "microscheme")
|
||||||
|
(version "0.9.2")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "https://github.com/ryansuchocki/"
|
||||||
|
"microscheme/archive/v" version ".zip"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0cmp1c6ilcib4w9ysqghav310g8jsq9gdfpfa9sd23wgl7mlncxf"))
|
||||||
|
(file-name (string-append name "-" version ".zip"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
`(#:parallel-build? #f ; fails to build otherwise
|
||||||
|
#:tests? #f ; no tests
|
||||||
|
#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(delete 'configure))
|
||||||
|
#:make-flags
|
||||||
|
(list (string-append "PREFIX=" (assoc-ref %outputs "out")))))
|
||||||
|
(native-inputs
|
||||||
|
`(("unzip" ,unzip)
|
||||||
|
("vim" ,vim))) ; for xxd
|
||||||
|
(home-page "http://microscheme.org/")
|
||||||
|
(synopsis "Scheme subset for Atmel microcontrollers")
|
||||||
|
(description
|
||||||
|
"Microscheme, or @code{(ms)} for short, is a functional programming
|
||||||
|
language for the Arduino, and for Atmel 8-bit AVR microcontrollers in general.
|
||||||
|
Microscheme is a subset of Scheme, in the sense that every valid @code{(ms)}
|
||||||
|
program is also a valid Scheme program (with the exception of Arduino
|
||||||
|
hardware-specific primitives). The @code{(ms)} compiler performs function
|
||||||
|
inlining, and features an aggressive tree-shaker, eliminating unused top-level
|
||||||
|
definitions. Microscheme has a robust @dfn{Foreign Function Interface} (FFI)
|
||||||
|
meaning that C code may be invoked directly from (ms) programs.")
|
||||||
|
(license license:expat)))
|
||||||
|
|
|
||||||
|
|
@ -30,9 +30,12 @@
|
||||||
#:use-module (gnu packages acl)
|
#:use-module (gnu packages acl)
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
|
#:use-module (gnu packages databases)
|
||||||
#:use-module (gnu packages dejagnu)
|
#:use-module (gnu packages dejagnu)
|
||||||
#:use-module (gnu packages glib)
|
#:use-module (gnu packages glib)
|
||||||
#:use-module (gnu packages gnupg)
|
#:use-module (gnu packages gnupg)
|
||||||
|
#:use-module (gnu packages gperf)
|
||||||
|
#:use-module (gnu packages guile)
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages mcrypt)
|
#:use-module (gnu packages mcrypt)
|
||||||
#:use-module (gnu packages nettle)
|
#:use-module (gnu packages nettle)
|
||||||
|
|
@ -148,6 +151,7 @@ backups (called chunks) to allow easy burning to CD/DVD.")
|
||||||
(search-patch "libarchive-CVE-2013-0211.patch")
|
(search-patch "libarchive-CVE-2013-0211.patch")
|
||||||
(search-patch "libarchive-bsdtar-test.patch")))))
|
(search-patch "libarchive-bsdtar-test.patch")))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
;; TODO: Add -L/path/to/nettle in libarchive.pc.
|
||||||
(inputs
|
(inputs
|
||||||
`(("zlib" ,zlib)
|
`(("zlib" ,zlib)
|
||||||
("nettle" ,nettle)
|
("nettle" ,nettle)
|
||||||
|
|
@ -353,3 +357,44 @@ deduplication technique used makes Attic suitable for daily backups since only
|
||||||
changes are stored.")
|
changes are stored.")
|
||||||
(home-page "https://attic-backup.org/")
|
(home-page "https://attic-backup.org/")
|
||||||
(license license:bsd-3)))
|
(license license:bsd-3)))
|
||||||
|
|
||||||
|
(define-public libchop
|
||||||
|
(package
|
||||||
|
(name "libchop")
|
||||||
|
(version "0.5.2")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "mirror://savannah/libchop/libchop-"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g"))
|
||||||
|
(patches
|
||||||
|
(list (search-patch "diffutils-gets-undeclared.patch")))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(native-inputs
|
||||||
|
`(("guile" ,guile-2.0)
|
||||||
|
("gperf" ,gperf)
|
||||||
|
("pkg-config" ,pkg-config)))
|
||||||
|
(inputs
|
||||||
|
`(("guile" ,guile-2.0)
|
||||||
|
("util-linux" ,util-linux)
|
||||||
|
("gnutls" ,gnutls)
|
||||||
|
("tdb" ,tdb)
|
||||||
|
("bdb" ,bdb)
|
||||||
|
("gdbm" ,gdbm)
|
||||||
|
("libgcrypt" ,libgcrypt)
|
||||||
|
("lzo" ,lzo)
|
||||||
|
("bzip2" ,bzip2)
|
||||||
|
("zlib" ,zlib)))
|
||||||
|
(home-page "http://nongnu.org/libchop/")
|
||||||
|
(synopsis "Tools & library for data backup and distributed storage")
|
||||||
|
(description
|
||||||
|
"Libchop is a set of utilities and library for data backup and
|
||||||
|
distributed storage. Its main application is @command{chop-backup}, an
|
||||||
|
encrypted backup program that supports data integrity checks, versioning,
|
||||||
|
distribution among several sites, selective sharing of stored data, adaptive
|
||||||
|
compression, and more. The library itself implements storage techniques such
|
||||||
|
as content-addressable storage, content hash keys, Merkle trees, similarity
|
||||||
|
detection, and lossless compression.")
|
||||||
|
(license license:gpl3+)))
|
||||||
|
|
|
||||||
|
|
@ -632,6 +632,21 @@ with the Linux kernel.")
|
||||||
(license lgpl2.0+)
|
(license lgpl2.0+)
|
||||||
(home-page "http://www.gnu.org/software/libc/")))
|
(home-page "http://www.gnu.org/software/libc/")))
|
||||||
|
|
||||||
|
(define-public glibc-2.21
|
||||||
|
;; The old libc, which we use mostly to build locale data in the old format
|
||||||
|
;; (which the new libc can cope with.)
|
||||||
|
(package
|
||||||
|
(inherit glibc)
|
||||||
|
(version "2.21")
|
||||||
|
(source (origin
|
||||||
|
(inherit (package-source glibc))
|
||||||
|
(uri (string-append "mirror://gnu/glibc/glibc-"
|
||||||
|
version ".tar.xz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1f135546j34s9bfkydmx2nhh9vwxlx60jldi80zmsnln6wj3dsxf"))
|
||||||
|
(patches (list (search-patch "glibc-ldd-x86_64.patch")))))))
|
||||||
|
|
||||||
(define-public glibc-locales
|
(define-public glibc-locales
|
||||||
(package
|
(package
|
||||||
(inherit glibc)
|
(inherit glibc)
|
||||||
|
|
|
||||||
|
|
@ -193,7 +193,7 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."
|
||||||
|
|
||||||
;; Bash is reportedly not parallel-safe. See, for instance,
|
;; Bash is reportedly not parallel-safe. See, for instance,
|
||||||
;; <http://patches.openembedded.org/patch/32745/> and
|
;; <http://patches.openembedded.org/patch/32745/> and
|
||||||
;; <http://git.buildroot.net/buildroot/commit/?h=79e2d802ae7e376a413c02097790493e1f65c3a4>.
|
;; <http://git.buildroot.net/buildroot/commit/?h=79e2d802a>.
|
||||||
#:parallel-build? #f
|
#:parallel-build? #f
|
||||||
#:parallel-tests? #f
|
#:parallel-tests? #f
|
||||||
|
|
||||||
|
|
@ -296,8 +296,10 @@ without modification.")
|
||||||
(completions (string-append out
|
(completions (string-append out
|
||||||
"/share/bash-completion"
|
"/share/bash-completion"
|
||||||
"/completions"))
|
"/completions"))
|
||||||
(already (find-files (string-append util-linux
|
(already (find-files
|
||||||
"/etc/bash_completion.d"))))
|
(string-append
|
||||||
|
util-linux
|
||||||
|
"/etc/bash_completion.d"))))
|
||||||
(with-directory-excursion completions
|
(with-directory-excursion completions
|
||||||
(for-each (lambda (file)
|
(for-each (lambda (file)
|
||||||
(when (file-exists? file)
|
(when (file-exists? file)
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,7 @@
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages machine-learning)
|
#:use-module (gnu packages machine-learning)
|
||||||
#:use-module (gnu packages maths)
|
#:use-module (gnu packages maths)
|
||||||
|
#:use-module (gnu packages mpi)
|
||||||
#:use-module (gnu packages ncurses)
|
#:use-module (gnu packages ncurses)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
|
|
@ -347,15 +348,14 @@ provide a coordinated and extensible framework to do computational biology.")
|
||||||
(define-public python-biopython
|
(define-public python-biopython
|
||||||
(package
|
(package
|
||||||
(name "python-biopython")
|
(name "python-biopython")
|
||||||
(version "1.65")
|
(version "1.66")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
;; use PyPi rather than biopython.org to ease updating
|
||||||
"http://biopython.org/DIST/biopython-"
|
(uri (pypi-uri "biopython" version))
|
||||||
version ".tar.gz"))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"13m8s9jkrw40zvdp1rl709n6lmgdh4f52aann7gzr6sfp0fwhg26"))))
|
"1gdv92593klimg22icf5j9by7xiq86jnwzkpz4abaa05ylkdf6hp"))))
|
||||||
(build-system python-build-system)
|
(build-system python-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("python-numpy" ,python-numpy)))
|
`(("python-numpy" ,python-numpy)))
|
||||||
|
|
@ -524,6 +524,89 @@ confidence to have in an alignment.")
|
||||||
license:lgpl2.0+
|
license:lgpl2.0+
|
||||||
license:asl2.0))))
|
license:asl2.0))))
|
||||||
|
|
||||||
|
(define-public bless
|
||||||
|
(package
|
||||||
|
(name "bless")
|
||||||
|
(version "1p02")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "mirror://sourceforge/bless-ec/bless.v"
|
||||||
|
version ".tgz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0rm0gw2s18dqwzzpl3c2x1z05ni2v0xz5dmfk3d33j6g4cgrlrdd"))
|
||||||
|
(modules '((guix build utils)))
|
||||||
|
(snippet
|
||||||
|
`(begin
|
||||||
|
;; Remove bundled boost, pigz, zlib, and .git directory
|
||||||
|
;; FIXME: also remove bundled sources for google-sparsehash,
|
||||||
|
;; murmurhash3, kmc once packaged.
|
||||||
|
(delete-file-recursively "boost")
|
||||||
|
(delete-file-recursively "pigz")
|
||||||
|
(delete-file-recursively "zlib")
|
||||||
|
(delete-file-recursively ".git")
|
||||||
|
#t))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
'(#:tests? #f ;no "check" target
|
||||||
|
#:make-flags
|
||||||
|
(list (string-append "ZLIB="
|
||||||
|
(assoc-ref %build-inputs "zlib")
|
||||||
|
"/lib/libz.a")
|
||||||
|
(string-append "LDFLAGS="
|
||||||
|
(string-join '("-lboost_filesystem"
|
||||||
|
"-lboost_system"
|
||||||
|
"-lboost_iostreams"
|
||||||
|
"-lz"
|
||||||
|
"-fopenmp"
|
||||||
|
"-std=c++11"))))
|
||||||
|
#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'do-not-build-bundled-pigz
|
||||||
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
|
(substitute* "Makefile"
|
||||||
|
(("cd pigz/pigz-2.3.3; make") ""))
|
||||||
|
#t))
|
||||||
|
(add-after 'unpack 'patch-paths-to-executables
|
||||||
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
|
(substitute* "parse_args.cpp"
|
||||||
|
(("kmc_binary = .*")
|
||||||
|
(string-append "kmc_binary = \""
|
||||||
|
(assoc-ref outputs "out")
|
||||||
|
"/bin/kmc\";"))
|
||||||
|
(("pigz_binary = .*")
|
||||||
|
(string-append "pigz_binary = \""
|
||||||
|
(assoc-ref inputs "pigz")
|
||||||
|
"/bin/pigz\";")))
|
||||||
|
#t))
|
||||||
|
(replace 'install
|
||||||
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
(let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
|
||||||
|
(for-each (lambda (file)
|
||||||
|
(install-file file bin))
|
||||||
|
'("bless" "kmc/bin/kmc"))
|
||||||
|
#t)))
|
||||||
|
(delete 'configure))))
|
||||||
|
(native-inputs
|
||||||
|
`(("perl" ,perl)))
|
||||||
|
(inputs
|
||||||
|
`(("openmpi" ,openmpi)
|
||||||
|
("boost" ,boost)
|
||||||
|
("pigz" ,pigz)
|
||||||
|
("zlib" ,zlib)))
|
||||||
|
(supported-systems '("x86_64-linux"))
|
||||||
|
(home-page "http://sourceforge.net/p/bless-ec/wiki/Home/")
|
||||||
|
(synopsis "Bloom-filter-based error correction tool for NGS reads")
|
||||||
|
(description
|
||||||
|
"@dfn{Bloom-filter-based error correction solution for high-throughput
|
||||||
|
sequencing reads} (BLESS) uses a single minimum-sized bloom filter is a
|
||||||
|
correction tool for genomic reads produced by @dfn{Next-generation
|
||||||
|
sequencing} (NGS). BLESS produces accurate correction results with much less
|
||||||
|
memory compared with previous solutions and is also able to tolerate a higher
|
||||||
|
false-positive rate. BLESS can extend reads like DNA assemblers to correct
|
||||||
|
errors at the end of reads.")
|
||||||
|
(license license:gpl3+)))
|
||||||
|
|
||||||
(define-public bowtie
|
(define-public bowtie
|
||||||
(package
|
(package
|
||||||
(name "bowtie")
|
(name "bowtie")
|
||||||
|
|
@ -805,15 +888,16 @@ time.")
|
||||||
(define-public crossmap
|
(define-public crossmap
|
||||||
(package
|
(package
|
||||||
(name "crossmap")
|
(name "crossmap")
|
||||||
(version "0.1.6")
|
(version "0.2.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://sourceforge/crossmap/CrossMap-"
|
(uri (string-append "mirror://sourceforge/crossmap/CrossMap-"
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"163hi5gjgij6cndxlvbkp5jjwr0k4wbm9im6d2210278q7k9kpnp"))
|
"07y179f63d7qnzdvkqcziwk9bs3k4zhp81q392fp1hwszjdvy22f"))
|
||||||
;; patch has been sent upstream already
|
;; This patch has been sent upstream already and is available
|
||||||
|
;; for download from Sourceforge, but it has not been merged.
|
||||||
(patches (list
|
(patches (list
|
||||||
(search-patch "crossmap-allow-system-pysam.patch")))
|
(search-patch "crossmap-allow-system-pysam.patch")))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
|
|
@ -1028,7 +1112,7 @@ data and settings.")
|
||||||
("perl" ,perl)))
|
("perl" ,perl)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("unzip" ,unzip)))
|
`(("unzip" ,unzip)))
|
||||||
(home-page "http://www.ncbi.nlm.nih.gov/books/NBK179288")
|
(home-page "http://www.ncbi.nlm.nih.gov/books/NBK179288/")
|
||||||
(synopsis "Tools for accessing the NCBI's set of databases")
|
(synopsis "Tools for accessing the NCBI's set of databases")
|
||||||
(description
|
(description
|
||||||
"Entrez Direct (EDirect) is a method for accessing the National Center
|
"Entrez Direct (EDirect) is a method for accessing the National Center
|
||||||
|
|
@ -1089,6 +1173,51 @@ analysis (from RNA-Seq), transcription factor binding quantification in
|
||||||
ChIP-Seq, and analysis of metagenomic data.")
|
ChIP-Seq, and analysis of metagenomic data.")
|
||||||
(license license:artistic2.0)))
|
(license license:artistic2.0)))
|
||||||
|
|
||||||
|
(define-public express-beta-diversity
|
||||||
|
(package
|
||||||
|
(name "express-beta-diversity")
|
||||||
|
(version "1.0.7")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri
|
||||||
|
(string-append
|
||||||
|
"https://github.com/dparks1134/ExpressBetaDiversity/archive/v"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1djvdlmqvjf6h0zq7w36y8cl5cli6rgj86x65znl48agnwmzxfxr"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
`(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(delete 'configure)
|
||||||
|
(add-before 'build 'enter-source (lambda _ (chdir "source") #t))
|
||||||
|
(replace 'check
|
||||||
|
(lambda _ (zero? (system* "../bin/ExpressBetaDiversity"
|
||||||
|
"-u"))))
|
||||||
|
(add-after 'check 'exit-source (lambda _ (chdir "..") #t))
|
||||||
|
(replace 'install
|
||||||
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
(let ((bin (string-append (assoc-ref outputs "out")
|
||||||
|
"/bin")))
|
||||||
|
(mkdir-p bin)
|
||||||
|
(copy-file "scripts/convertToEBD.py"
|
||||||
|
(string-append bin "/convertToEBD.py"))
|
||||||
|
(copy-file "bin/ExpressBetaDiversity"
|
||||||
|
(string-append bin "/ExpressBetaDiversity"))
|
||||||
|
#t))))))
|
||||||
|
(inputs
|
||||||
|
`(("python" ,python-2)))
|
||||||
|
(home-page "http://kiwi.cs.dal.ca/Software/ExpressBetaDiversity")
|
||||||
|
(synopsis "Taxon- and phylogenetic-based beta diversity measures")
|
||||||
|
(description
|
||||||
|
"Express Beta Diversity (EBD) calculates ecological beta diversity
|
||||||
|
(dissimilarity) measures between biological communities. EBD implements a
|
||||||
|
variety of diversity measures including those that make use of phylogenetic
|
||||||
|
similarity of community members.")
|
||||||
|
(license license:gpl3+)))
|
||||||
|
|
||||||
(define-public fasttree
|
(define-public fasttree
|
||||||
(package
|
(package
|
||||||
(name "fasttree")
|
(name "fasttree")
|
||||||
|
|
@ -1328,6 +1457,9 @@ estimates transcript expression.")
|
||||||
`(("perl" ,perl)
|
`(("perl" ,perl)
|
||||||
("python" ,python)
|
("python" ,python)
|
||||||
("zlib" ,zlib)))
|
("zlib" ,zlib)))
|
||||||
|
;; Non-portable SSE instructions are used so building fails on platforms
|
||||||
|
;; other than x86_64.
|
||||||
|
(supported-systems '("x86_64-linux"))
|
||||||
(home-page "http://ccb.jhu.edu/software/hisat/index.shtml")
|
(home-page "http://ccb.jhu.edu/software/hisat/index.shtml")
|
||||||
(synopsis "Hierarchical indexing for spliced alignment of transcripts")
|
(synopsis "Hierarchical indexing for spliced alignment of transcripts")
|
||||||
(description
|
(description
|
||||||
|
|
@ -1382,9 +1514,11 @@ HMMs).")
|
||||||
"1i85ppf2j2lj12m0x690qq5nn17xxk23pbbx2c83r8ayb5wngzwv"))))
|
"1i85ppf2j2lj12m0x690qq5nn17xxk23pbbx2c83r8ayb5wngzwv"))))
|
||||||
(build-system python-build-system)
|
(build-system python-build-system)
|
||||||
(arguments `(#:python ,python-2)) ; only Python 2 is supported
|
(arguments `(#:python ,python-2)) ; only Python 2 is supported
|
||||||
(inputs
|
;; Numpy needs to be propagated when htseq is used as a Python library.
|
||||||
`(("python-numpy" ,python2-numpy)
|
(propagated-inputs
|
||||||
("python-setuptools" ,python2-setuptools)))
|
`(("python-numpy" ,python2-numpy)))
|
||||||
|
(native-inputs
|
||||||
|
`(("python-setuptools" ,python2-setuptools)))
|
||||||
(home-page "http://www-huber.embl.de/users/anders/HTSeq/")
|
(home-page "http://www-huber.embl.de/users/anders/HTSeq/")
|
||||||
(synopsis "Analysing high-throughput sequencing data with Python")
|
(synopsis "Analysing high-throughput sequencing data with Python")
|
||||||
(description
|
(description
|
||||||
|
|
@ -1838,19 +1972,25 @@ the phenotype as it models the data.")
|
||||||
(license license:asl2.0)))
|
(license license:asl2.0)))
|
||||||
|
|
||||||
(define-public pbtranscript-tofu
|
(define-public pbtranscript-tofu
|
||||||
(let ((commit "c7bbd5472"))
|
(let ((commit "8f5467fe6"))
|
||||||
(package
|
(package
|
||||||
(name "pbtranscript-tofu")
|
(name "pbtranscript-tofu")
|
||||||
(version (string-append "0.4.1." commit))
|
(version (string-append "2.2.3." commit))
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "https://github.com/PacificBiosciences/cDNA_primer.git")
|
(url "https://github.com/PacificBiosciences/cDNA_primer.git")
|
||||||
(commit commit)))
|
(commit commit)))
|
||||||
(file-name (string-append name "-" version ".tar.gz"))
|
(file-name (string-append name "-" version "-checkout"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"148xkzi689c49g6fdhckp6mnmj2qhjdf1j4wifm6ja7ij95d7fxx"))))
|
"1lgnpi35ihay42qx0b6yl3kkgra723i413j33kvs0kvs61h82w0f"))
|
||||||
|
(modules '((guix build utils)))
|
||||||
|
(snippet
|
||||||
|
'(begin
|
||||||
|
;; remove bundled Cython sources
|
||||||
|
(delete-file "pbtranscript-tofu/pbtranscript/Cython-0.20.1.tar.gz")
|
||||||
|
#t))))
|
||||||
(build-system python-build-system)
|
(build-system python-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:python ,python-2
|
`(#:python ,python-2
|
||||||
|
|
@ -1860,34 +2000,29 @@ the phenotype as it models the data.")
|
||||||
#:configure-flags '("--single-version-externally-managed"
|
#:configure-flags '("--single-version-externally-managed"
|
||||||
"--record=pbtranscript-tofu.txt")
|
"--record=pbtranscript-tofu.txt")
|
||||||
#:phases
|
#:phases
|
||||||
(alist-cons-after
|
(modify-phases %standard-phases
|
||||||
'unpack 'enter-directory-and-clean-up
|
(add-after 'unpack 'enter-directory
|
||||||
(lambda _
|
(lambda _
|
||||||
(chdir "pbtranscript-tofu/pbtranscript/")
|
(chdir "pbtranscript-tofu/pbtranscript/")
|
||||||
;; Delete clutter
|
#t))
|
||||||
(delete-file-recursively "dist/")
|
;; With setuptools version 18.0 and later this setup.py hack causes
|
||||||
(delete-file-recursively "build/")
|
;; a build error, so we disable it.
|
||||||
(delete-file-recursively "setuptools_cython-0.2.1-py2.6.egg/")
|
(add-after 'enter-directory 'patch-setuppy
|
||||||
(delete-file-recursively "pbtools.pbtranscript.egg-info")
|
(lambda _
|
||||||
(delete-file "Cython-0.20.1.tar.gz")
|
(substitute* "setup.py"
|
||||||
(delete-file "setuptools_cython-0.2.1-py2.7.egg")
|
(("if 'setuptools.extension' in sys.modules:")
|
||||||
(delete-file "setuptools_cython-0.2.1.tar.gz")
|
"if False:"))
|
||||||
(delete-file "setup.cfg")
|
#t)))))
|
||||||
(for-each delete-file
|
|
||||||
(find-files "." "\\.so$"))
|
|
||||||
;; files should be writable for install phase
|
|
||||||
(for-each (lambda (f) (chmod f #o755))
|
|
||||||
(find-files "." "\\.py$")))
|
|
||||||
%standard-phases)))
|
|
||||||
(inputs
|
(inputs
|
||||||
`(("python-cython" ,python2-cython)
|
`(("python-numpy" ,python2-numpy)
|
||||||
("python-numpy" ,python2-numpy)
|
|
||||||
("python-bx-python" ,python2-bx-python)
|
("python-bx-python" ,python2-bx-python)
|
||||||
("python-networkx" ,python2-networkx)
|
("python-networkx" ,python2-networkx)
|
||||||
("python-scipy" ,python2-scipy)
|
("python-scipy" ,python2-scipy)
|
||||||
("python-pbcore" ,python2-pbcore)))
|
("python-pbcore" ,python2-pbcore)
|
||||||
|
("python-h5py" ,python2-h5py)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("python-nose" ,python2-nose)
|
`(("python-cython" ,python2-cython)
|
||||||
|
("python-nose" ,python2-nose)
|
||||||
("python-setuptools" ,python2-setuptools)))
|
("python-setuptools" ,python2-setuptools)))
|
||||||
(home-page "https://github.com/PacificBiosciences/cDNA_primer")
|
(home-page "https://github.com/PacificBiosciences/cDNA_primer")
|
||||||
(synopsis "Analyze transcriptome data generated with the Iso-Seq protocol")
|
(synopsis "Analyze transcriptome data generated with the Iso-Seq protocol")
|
||||||
|
|
@ -2149,10 +2284,57 @@ viewer.")
|
||||||
(string-append bin "/samtools")))))
|
(string-append bin "/samtools")))))
|
||||||
(delete 'patch-tests)))))))
|
(delete 'patch-tests)))))))
|
||||||
|
|
||||||
|
(define-public mosaik
|
||||||
|
(let ((commit "5c25216d"))
|
||||||
|
(package
|
||||||
|
(name "mosaik")
|
||||||
|
(version "2.2.30")
|
||||||
|
(source (origin
|
||||||
|
;; There are no release tarballs nor tags.
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/wanpinglee/MOSAIK.git")
|
||||||
|
(commit commit)))
|
||||||
|
(file-name (string-append name "-" version))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"17gj3s07cm77r41z92awh0bim7w7q7fbn0sf5nkqmcm1vw052qgw"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
`(#:tests? #f ; no tests
|
||||||
|
#:make-flags (list "CC=gcc")
|
||||||
|
#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(replace 'configure
|
||||||
|
(lambda _ (chdir "src") #t))
|
||||||
|
(replace 'install
|
||||||
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
(let ((bin (string-append (assoc-ref outputs "out")
|
||||||
|
"/bin")))
|
||||||
|
(mkdir-p bin)
|
||||||
|
(copy-recursively "../bin" bin)
|
||||||
|
#t))))))
|
||||||
|
(inputs
|
||||||
|
`(("perl" ,perl)
|
||||||
|
("zlib" ,zlib)))
|
||||||
|
(supported-systems '("x86_64-linux"))
|
||||||
|
(home-page "https://code.google.com/p/mosaik-aligner/")
|
||||||
|
(synopsis "Map nucleotide sequence reads to reference genomes")
|
||||||
|
(description
|
||||||
|
"MOSAIK is a program for mapping second and third-generation sequencing
|
||||||
|
reads to a reference genome. MOSAIK can align reads generated by all the
|
||||||
|
major sequencing technologies, including Illumina, Applied Biosystems SOLiD,
|
||||||
|
Roche 454, Ion Torrent and Pacific BioSciences SMRT.")
|
||||||
|
;; MOSAIK is released under the GPLv2+ with the exception of third-party
|
||||||
|
;; code released into the public domain:
|
||||||
|
;; 1. fastlz by Ariya Hidayat - http://www.fastlz.org/
|
||||||
|
;; 2. MD5 implementation - RSA Data Security, RFC 1321
|
||||||
|
(license (list license:gpl2+ license:public-domain)))))
|
||||||
|
|
||||||
(define-public ngs-sdk
|
(define-public ngs-sdk
|
||||||
(package
|
(package
|
||||||
(name "ngs-sdk")
|
(name "ngs-sdk")
|
||||||
(version "1.1.1")
|
(version "1.2.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -2162,7 +2344,7 @@ viewer.")
|
||||||
(file-name (string-append name "-" version ".tar.gz"))
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1x58gpm574n0xmk2a98gmikbgycq78ia0bvnb42k5ck34fmd5v8y"))))
|
"0rvq61zfw2h9jcz6a33b9xrl20r7s5a9rldvv6rs2qy42khpmf5j"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:parallel-build? #f ; not supported
|
`(#:parallel-build? #f ; not supported
|
||||||
|
|
@ -2206,26 +2388,8 @@ simultaneously.")
|
||||||
(srfi srfi-26))
|
(srfi srfi-26))
|
||||||
,@(package-arguments ngs-sdk))
|
,@(package-arguments ngs-sdk))
|
||||||
((#:phases phases)
|
((#:phases phases)
|
||||||
`(alist-cons-after
|
`(modify-phases ,phases
|
||||||
'enter-dir 'fix-java-symlink-installation
|
(replace 'enter-dir (lambda _ (chdir "ngs-java") #t)))))))
|
||||||
(lambda _
|
|
||||||
;; Only replace the version suffix, not the version number in
|
|
||||||
;; the directory name. Reported here:
|
|
||||||
;; https://github.com/ncbi/ngs/pull/4
|
|
||||||
(substitute* "Makefile.java"
|
|
||||||
(((string-append "\\$\\(subst "
|
|
||||||
"(\\$\\(VERSION[^\\)]*\\)),"
|
|
||||||
"(\\$\\([^\\)]+\\)),"
|
|
||||||
"(\\$\\([^\\)]+\\)|\\$\\@)"
|
|
||||||
"\\)")
|
|
||||||
_ pattern replacement target)
|
|
||||||
(string-append "$(patsubst "
|
|
||||||
"%" pattern ","
|
|
||||||
"%" replacement ","
|
|
||||||
target ")"))))
|
|
||||||
(alist-replace
|
|
||||||
'enter-dir (lambda _ (chdir "ngs-java") #t)
|
|
||||||
,phases))))))
|
|
||||||
(inputs
|
(inputs
|
||||||
`(("jdk" ,icedtea6 "jdk")
|
`(("jdk" ,icedtea6 "jdk")
|
||||||
("ngs-sdk" ,ngs-sdk)))
|
("ngs-sdk" ,ngs-sdk)))
|
||||||
|
|
@ -2234,7 +2398,7 @@ simultaneously.")
|
||||||
(define-public ncbi-vdb
|
(define-public ncbi-vdb
|
||||||
(package
|
(package
|
||||||
(name "ncbi-vdb")
|
(name "ncbi-vdb")
|
||||||
(version "2.4.5-5")
|
(version "2.5.4")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -2244,7 +2408,7 @@ simultaneously.")
|
||||||
(file-name (string-append name "-" version ".tar.gz"))
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1cj8nk6if8sqagv20vx36v566fdvhcaadf0x1ycnbgql6chbs6vy"))))
|
"1rcnyc4xkdfcjww2i0s0qrbapys0cxbjcx2sy3qkpslf9f400fgj"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:parallel-build? #f ; not supported
|
`(#:parallel-build? #f ; not supported
|
||||||
|
|
@ -2254,20 +2418,6 @@ simultaneously.")
|
||||||
'configure
|
'configure
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
(let ((out (assoc-ref outputs "out")))
|
(let ((out (assoc-ref outputs "out")))
|
||||||
;; Only replace the version suffix, not the version number in the
|
|
||||||
;; directory name; fixed in commit 4dbba5c6a809 (no release yet).
|
|
||||||
(substitute* "setup/konfigure.perl"
|
|
||||||
(((string-append "\\$\\(subst "
|
|
||||||
"(\\$\\(VERSION[^\\)]*\\)),"
|
|
||||||
"(\\$\\([^\\)]+\\)),"
|
|
||||||
"(\\$\\([^\\)]+\\)|\\$\\@)"
|
|
||||||
"\\)")
|
|
||||||
_ pattern replacement target)
|
|
||||||
(string-append "$(patsubst "
|
|
||||||
"%" pattern ","
|
|
||||||
"%" replacement ","
|
|
||||||
target ")")))
|
|
||||||
|
|
||||||
;; Override include path for libmagic
|
;; Override include path for libmagic
|
||||||
(substitute* "setup/package.prl"
|
(substitute* "setup/package.prl"
|
||||||
(("name => 'magic', Include => '/usr/include'")
|
(("name => 'magic', Include => '/usr/include'")
|
||||||
|
|
@ -2383,49 +2533,95 @@ subsequent visualization, annotation and storage of results.")
|
||||||
;; LGPLv2.1+
|
;; LGPLv2.1+
|
||||||
(license (list license:gpl2 license:lgpl2.1+))))
|
(license (list license:gpl2 license:lgpl2.1+))))
|
||||||
|
|
||||||
|
(define-public smithlab-cpp
|
||||||
|
(let ((revision "1")
|
||||||
|
(commit "728a097"))
|
||||||
|
(package
|
||||||
|
(name "smithlab-cpp")
|
||||||
|
(version (string-append "0." revision "." commit))
|
||||||
|
(source (origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/smithlabcode/smithlab_cpp.git")
|
||||||
|
(commit commit)))
|
||||||
|
(file-name (string-append name "-" version "-checkout"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0d476lmj312xk77kr9fzrv7z1bv96yfyx0w7y62ycmnfbx32ll74"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
`(#:modules ((guix build gnu-build-system)
|
||||||
|
(guix build utils)
|
||||||
|
(srfi srfi-26))
|
||||||
|
#:tests? #f ;no "check" target
|
||||||
|
#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'use-samtools-headers
|
||||||
|
(lambda _
|
||||||
|
(substitute* '("SAM.cpp"
|
||||||
|
"SAM.hpp")
|
||||||
|
(("sam.h") "samtools/sam.h"))
|
||||||
|
#t))
|
||||||
|
(replace 'install
|
||||||
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
|
(lib (string-append out "/lib"))
|
||||||
|
(include (string-append out "/include/smithlab-cpp")))
|
||||||
|
(mkdir-p lib)
|
||||||
|
(mkdir-p include)
|
||||||
|
(for-each (cut install-file <> lib)
|
||||||
|
(find-files "." "\\.o$"))
|
||||||
|
(for-each (cut install-file <> include)
|
||||||
|
(find-files "." "\\.hpp$")))
|
||||||
|
#t))
|
||||||
|
(delete 'configure))))
|
||||||
|
(inputs
|
||||||
|
`(("samtools" ,samtools-0.1)
|
||||||
|
("zlib" ,zlib)))
|
||||||
|
(home-page "https://github.com/smithlabcode/smithlab_cpp")
|
||||||
|
(synopsis "C++ helper library for functions used in Smith lab projects")
|
||||||
|
(description
|
||||||
|
"Smithlab CPP is a C++ library that includes functions used in many of
|
||||||
|
the Smith lab bioinformatics projects, such as a wrapper around Samtools data
|
||||||
|
structures, classes for genomic regions, mapped sequencing reads, etc.")
|
||||||
|
(license license:gpl3+))))
|
||||||
|
|
||||||
(define-public preseq
|
(define-public preseq
|
||||||
(package
|
(package
|
||||||
(name "preseq")
|
(name "preseq")
|
||||||
(version "1.0.2")
|
(version "2.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri
|
(uri (string-append "https://github.com/smithlabcode/"
|
||||||
(string-append "http://smithlabresearch.org/downloads/preseq-"
|
"preseq/archive/v" version ".tar.gz"))
|
||||||
version ".tar.bz2"))
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0r7sw07p6nv8ygvc17gd78lisbw5336v3vhs86b5wv8mw3pwqksc"))
|
(base32 "08r684l50pnxjpvmhzjgqq56yv9rfw90k8vx0nsrnrzk8mf9hsdq"))
|
||||||
(patches (list (search-patch "preseq-1.0.2-install-to-PREFIX.patch")
|
|
||||||
(search-patch "preseq-1.0.2-link-with-libbam.patch")))
|
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
;; Remove bundled samtools.
|
;; Remove bundled samtools.
|
||||||
'(delete-file-recursively "preseq-master/samtools"))))
|
'(delete-file-recursively "samtools"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ;no "check" target
|
`(#:tests? #f ;no "check" target
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after
|
|
||||||
'unpack 'enter-dir
|
|
||||||
(lambda _
|
|
||||||
(chdir "preseq-master")
|
|
||||||
#t))
|
|
||||||
(add-after
|
|
||||||
'enter-dir 'use-samtools-headers
|
|
||||||
(lambda _
|
|
||||||
(substitute* '("smithlab_cpp/SAM.cpp"
|
|
||||||
"smithlab_cpp/SAM.hpp")
|
|
||||||
(("sam.h") "samtools/sam.h"))
|
|
||||||
#t))
|
|
||||||
(delete 'configure))
|
(delete 'configure))
|
||||||
#:make-flags (list (string-append "PREFIX="
|
#:make-flags
|
||||||
(assoc-ref %outputs "out"))
|
(list (string-append "PREFIX="
|
||||||
(string-append "LIBBAM="
|
(assoc-ref %outputs "out"))
|
||||||
(assoc-ref %build-inputs "samtools")
|
(string-append "LIBBAM="
|
||||||
"/lib/libbam.a"))))
|
(assoc-ref %build-inputs "samtools")
|
||||||
|
"/lib/libbam.a")
|
||||||
|
(string-append "SMITHLAB_CPP="
|
||||||
|
(assoc-ref %build-inputs "smithlab-cpp")
|
||||||
|
"/lib")
|
||||||
|
"PROGS=preseq"
|
||||||
|
"INCLUDEDIRS=$(SMITHLAB_CPP)/../include/smithlab-cpp $(SAMTOOLS_DIR)")))
|
||||||
(inputs
|
(inputs
|
||||||
`(("gsl" ,gsl)
|
`(("gsl" ,gsl)
|
||||||
("samtools" ,samtools-0.1)
|
("samtools" ,samtools-0.1)
|
||||||
|
("smithlab-cpp" ,smithlab-cpp)
|
||||||
("zlib" ,zlib)))
|
("zlib" ,zlib)))
|
||||||
(home-page "http://smithlabresearch.org/software/preseq/")
|
(home-page "http://smithlabresearch.org/software/preseq/")
|
||||||
(synopsis "Program for analyzing library complexity")
|
(synopsis "Program for analyzing library complexity")
|
||||||
|
|
@ -2442,7 +2638,7 @@ complexity samples.")
|
||||||
(define-public sra-tools
|
(define-public sra-tools
|
||||||
(package
|
(package
|
||||||
(name "sra-tools")
|
(name "sra-tools")
|
||||||
(version "2.4.5-5")
|
(version "2.5.4")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -2452,7 +2648,7 @@ complexity samples.")
|
||||||
(file-name (string-append name "-" version ".tar.gz"))
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"11nrnvz7a012f4iryf0wiwrid0h111grsfxbxa9j51h3f2xbvgns"))))
|
"1rxxc8a34g70jcaa2j8sys2x93amlbc24k7az39wldhkzgi96825"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:parallel-build? #f ; not supported
|
`(#:parallel-build? #f ; not supported
|
||||||
|
|
@ -2595,6 +2791,43 @@ BioPython in a convenient way. Instead of having a big mess of scripts, there
|
||||||
is one that takes arguments.")
|
is one that takes arguments.")
|
||||||
(license license:gpl3)))
|
(license license:gpl3)))
|
||||||
|
|
||||||
|
(define-public snap-aligner
|
||||||
|
(package
|
||||||
|
(name "snap-aligner")
|
||||||
|
(version "1.0beta.18")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/amplab/snap/archive/v"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1vnsjwv007k1fl1q7d681kbwn6bc66cgw6h16hym6gvyy71qv2ly"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(delete 'configure)
|
||||||
|
(replace 'check (lambda _ (zero? (system* "./unit_tests"))))
|
||||||
|
(replace 'install
|
||||||
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
|
(bin (string-append out "/bin")))
|
||||||
|
(mkdir-p bin)
|
||||||
|
(install-file "snap-aligner" bin)
|
||||||
|
(install-file "SNAPCommand" bin)
|
||||||
|
#t))))))
|
||||||
|
(native-inputs
|
||||||
|
`(("zlib" ,zlib)))
|
||||||
|
(home-page "http://snap.cs.berkeley.edu/")
|
||||||
|
(synopsis "Short read DNA sequence aligner")
|
||||||
|
(description
|
||||||
|
"SNAP is a fast and accurate aligner for short DNA reads. It is
|
||||||
|
optimized for modern read lengths of 100 bases or higher, and takes advantage
|
||||||
|
of these reads to align data quickly through a hash-based indexing scheme.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
(define-public star
|
(define-public star
|
||||||
(package
|
(package
|
||||||
(name "star")
|
(name "star")
|
||||||
|
|
@ -2657,7 +2890,24 @@ sequences.")
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ;no "check" target
|
`(#:tests? #f ;no "check" target
|
||||||
#:make-flags '("-f" "Makefile.Linux")
|
;; The CC and CCFLAGS variables are set to contain a lot of x86_64
|
||||||
|
;; optimizations by default, so we override these flags such that x86_64
|
||||||
|
;; flags are only added when the build target is an x86_64 system.
|
||||||
|
#:make-flags
|
||||||
|
(list (let ((system ,(or (%current-target-system)
|
||||||
|
(%current-system)))
|
||||||
|
(flags '("-ggdb" "-fomit-frame-pointer"
|
||||||
|
"-ffast-math" "-funroll-loops"
|
||||||
|
"-fmessage-length=0"
|
||||||
|
"-O9" "-Wall" "-DMAKE_FOR_EXON"
|
||||||
|
"-DMAKE_STANDALONE"
|
||||||
|
"-DSUBREAD_VERSION=\\\"${SUBREAD_VERSION}\\\""))
|
||||||
|
(flags64 '("-mmmx" "-msse" "-msse2" "-msse3")))
|
||||||
|
(if (string-prefix? "x86_64" system)
|
||||||
|
(string-append "CCFLAGS=" (string-join (append flags flags64)))
|
||||||
|
(string-append "CCFLAGS=" (string-join flags))))
|
||||||
|
"-f" "Makefile.Linux"
|
||||||
|
"CC=gcc ${CCFLAGS}")
|
||||||
#:phases
|
#:phases
|
||||||
(alist-cons-after
|
(alist-cons-after
|
||||||
'unpack 'enter-dir
|
'unpack 'enter-dir
|
||||||
|
|
|
||||||
|
|
@ -40,12 +40,12 @@
|
||||||
"12v7nri79v8gns3inmz4k24q7pcnwi00hybs0wddfkcy1afh42xf"))))
|
"12v7nri79v8gns3inmz4k24q7pcnwi00hybs0wddfkcy1afh42xf"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:phases
|
||||||
(alist-replace
|
(alist-replace
|
||||||
'configure
|
'configure
|
||||||
(lambda _ (zero? (system* "make" "defconfig")))
|
(lambda _ (zero? (system* "make" "defconfig")))
|
||||||
(alist-replace
|
(alist-replace
|
||||||
'check
|
'check
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* '("testsuite/du/du-s-works"
|
(substitute* '("testsuite/du/du-s-works"
|
||||||
"testsuite/du/du-works")
|
"testsuite/du/du-works")
|
||||||
|
|
@ -70,7 +70,7 @@
|
||||||
;; So mark it with SKIP_KNOWN_BUGS like the others.
|
;; So mark it with SKIP_KNOWN_BUGS like the others.
|
||||||
;; Presumably it wasn't known at the time of release ...
|
;; Presumably it wasn't known at the time of release ...
|
||||||
;; (It is strange that they release software which they know to have bugs)
|
;; (It is strange that they release software which they know to have bugs)
|
||||||
(("testing \"grep -w \\^str doesn't match str not at the beginning\"")
|
(("testing \"grep -w \\^str doesn't match str not at the beginning\"")
|
||||||
"test x\"$SKIP_KNOWN_BUGS\" = x\"\" && testing \"grep -w ^str doesn't match str not at the beginning\""))
|
"test x\"$SKIP_KNOWN_BUGS\" = x\"\" && testing \"grep -w ^str doesn't match str not at the beginning\""))
|
||||||
|
|
||||||
;; This test cannot possibly pass.
|
;; This test cannot possibly pass.
|
||||||
|
|
@ -79,7 +79,7 @@
|
||||||
(delete-file "testsuite/which/which-uses-default-path")
|
(delete-file "testsuite/which/which-uses-default-path")
|
||||||
(rmdir "testsuite/which")
|
(rmdir "testsuite/which")
|
||||||
|
|
||||||
(zero? (system* "make"
|
(zero? (system* "make"
|
||||||
;; "V=1"
|
;; "V=1"
|
||||||
"SKIP_KNOWN_BUGS=1"
|
"SKIP_KNOWN_BUGS=1"
|
||||||
"SKIP_INTERNET_TESTS=1"
|
"SKIP_INTERNET_TESTS=1"
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,8 @@
|
||||||
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
|
;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
|
||||||
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
||||||
|
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||||
|
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -124,14 +126,14 @@ libcdio.")
|
||||||
(define-public xorriso
|
(define-public xorriso
|
||||||
(package
|
(package
|
||||||
(name "xorriso")
|
(name "xorriso")
|
||||||
(version "1.4.0")
|
(version "1.4.2")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnu/xorriso/xorriso-"
|
(uri (string-append "mirror://gnu/xorriso/xorriso-"
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0mhfxn2idkrw1i65a5y4gnb1fig85zpnszb9ax7w4a2v062y1l8b"))))
|
"1cq4a0904lnz6nygbgarnlq49cz4qnfdyvz90s3nfk5as7gbwhr8"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("acl" ,acl)
|
`(("acl" ,acl)
|
||||||
|
|
@ -156,7 +158,8 @@ files.")
|
||||||
(version "10.2")
|
(version "10.2")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-"
|
(uri (string-append "http://downloads.xiph.org/releases/"
|
||||||
|
"cdparanoia/cdparanoia-III-"
|
||||||
version ".src.tgz"))
|
version ".src.tgz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
|
|
@ -231,6 +234,25 @@ depend on the file system of the medium. The maximum error correction
|
||||||
capacity is user-selectable.")
|
capacity is user-selectable.")
|
||||||
(license gpl2+)))
|
(license gpl2+)))
|
||||||
|
|
||||||
|
(define-public libcue
|
||||||
|
(package
|
||||||
|
(name "libcue")
|
||||||
|
(version "1.4.0")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "mirror://sourceforge/libcue/libcue-"
|
||||||
|
version ".tar.bz2"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"17kjd7rjz1bvfn44n3n2bjb7a1ywd0yc0g4sqp5ihf9b5bn7cwlb"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(home-page "http://libcue.sourceforge.net/")
|
||||||
|
(synopsis "C library to parse cue sheets")
|
||||||
|
(description "Libcue is a C library to parse so-called @dfn{cue sheets}
|
||||||
|
which contain meta-data for CD/DVD tracks. It provides an API to manipulate
|
||||||
|
the data.")
|
||||||
|
(license gpl2+)))
|
||||||
|
|
||||||
(define-public cd-discid
|
(define-public cd-discid
|
||||||
(package
|
(package
|
||||||
(name "cd-discid")
|
(name "cd-discid")
|
||||||
|
|
|
||||||
|
|
@ -36,15 +36,15 @@
|
||||||
(define-public cmake
|
(define-public cmake
|
||||||
(package
|
(package
|
||||||
(name "cmake")
|
(name "cmake")
|
||||||
(version "3.3.1")
|
(version "3.3.2")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append "https://www.cmake.org/files/v"
|
||||||
"http://www.cmake.org/files/v"
|
(version-major+minor version)
|
||||||
(version-major+minor version)
|
"/cmake-" version ".tar.gz"))
|
||||||
"/cmake-" version ".tar.gz"))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1mp32dqywk4dfw7zmpgp31axszv7h74yk69g273z21q7d8n04rfd"))
|
(base32
|
||||||
|
"08pwy9ip9cgwgynhn5vrjw8drw29gijy1rmziq22n65zds6ifnp7"))
|
||||||
(patches (list (search-patch "cmake-fix-tests.patch")))))
|
(patches (list (search-patch "cmake-fix-tests.patch")))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
|
|
@ -66,7 +66,8 @@
|
||||||
"Source/cmExecProgramCommand.cxx"
|
"Source/cmExecProgramCommand.cxx"
|
||||||
"Utilities/cmbzip2/Makefile-libbz2_so"
|
"Utilities/cmbzip2/Makefile-libbz2_so"
|
||||||
"Utilities/Release/release_cmake.cmake"
|
"Utilities/Release/release_cmake.cmake"
|
||||||
"Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c"
|
"Utilities/cmlibarchive/libarchive/\
|
||||||
|
archive_write_set_format_shar.c"
|
||||||
"Tests/CMakeLists.txt"
|
"Tests/CMakeLists.txt"
|
||||||
"Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
|
"Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
|
||||||
(("/bin/sh") (which "sh"))))
|
(("/bin/sh") (which "sh"))))
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@
|
||||||
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
|
;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
|
||||||
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
|
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
|
||||||
|
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -25,6 +26,7 @@
|
||||||
|
|
||||||
(define-module (gnu packages compression)
|
(define-module (gnu packages compression)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix utils)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix git-download)
|
#:use-module (guix git-download)
|
||||||
|
|
@ -225,14 +227,46 @@ decompression.")
|
||||||
"See LICENSE in the distribution."))
|
"See LICENSE in the distribution."))
|
||||||
(home-page "http://www.bzip.org/"))))
|
(home-page "http://www.bzip.org/"))))
|
||||||
|
|
||||||
|
(define-public pbzip2
|
||||||
|
(package
|
||||||
|
(name "pbzip2")
|
||||||
|
(version "1.1.12")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "https://launchpad.net/pbzip2/"
|
||||||
|
(version-major+minor version) "/" version
|
||||||
|
"/+download/" name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1vk6065dv3a47p86vmp8hv3n1ygd9hraz0gq89gvzlx7lmcb6fsp"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(inputs
|
||||||
|
`(("bzip2", bzip2)))
|
||||||
|
(arguments
|
||||||
|
`(#:tests? #f ; no tests
|
||||||
|
#:phases (modify-phases %standard-phases
|
||||||
|
(delete 'configure))
|
||||||
|
#:make-flags (list (string-append "PREFIX=" %output))))
|
||||||
|
(home-page "http://compression.ca/pbzip2/")
|
||||||
|
(synopsis "Parallel bzip2 implementation")
|
||||||
|
(description
|
||||||
|
"Pbzip2 is a parallel implementation of the bzip2 block-sorting file
|
||||||
|
compressor that uses pthreads and achieves near-linear speedup on SMP machines.
|
||||||
|
The output of this version is fully compatible with bzip2 v1.0.2 (i.e. anything
|
||||||
|
compressed with pbzip2 can be decompressed with bzip2).")
|
||||||
|
(license (license:non-copyleft "file://COPYING"
|
||||||
|
"See COPYING in the distribution."))))
|
||||||
|
|
||||||
(define-public xz
|
(define-public xz
|
||||||
(package
|
(package
|
||||||
(name "xz")
|
(name "xz")
|
||||||
(version "5.2.2")
|
(version "5.2.2")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://tukaani.org/xz/xz-" version
|
(uri (list (string-append "http://tukaani.org/xz/xz-" version
|
||||||
".tar.gz"))
|
".tar.gz")
|
||||||
|
(string-append "http://multiprecision.org/guix/xz-"
|
||||||
|
version ".tar.gz")))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"18h2k4jndhzjs8ln3a54qdnfv59y6spxiwh9gpaqniph6iflvpvk"))))
|
"18h2k4jndhzjs8ln3a54qdnfv59y6spxiwh9gpaqniph6iflvpvk"))))
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com>
|
;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com>
|
||||||
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -28,46 +28,42 @@
|
||||||
(define-public conkeror
|
(define-public conkeror
|
||||||
(package
|
(package
|
||||||
(name "conkeror")
|
(name "conkeror")
|
||||||
(version "1.0pre1")
|
(version "1.0pre1.20150730")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri
|
(uri
|
||||||
(string-append "http://repo.or.cz/w/conkeror.git/snapshot/"
|
(string-append "http://repo.or.cz/w/conkeror.git/snapshot/"
|
||||||
"8a26fff5896a3360549e2adfbf06b1d57e909266"
|
"a1f7e879b129df5cf14ea4ce80a9c1407380ed58"
|
||||||
".tar.gz")) ; tag: debian-1.0--pre-1+git140616-1
|
".tar.gz")) ; tag: debian-1.0--pre-1+git150730-1
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1cgjzi7g3g22zcx6bpfnid4i12sb45w6icmxdzjn8d3c0m8qsyp1"))))
|
"1q45hc30733gz3ca2ixvw0rzzcbi7rlay7gx7kvzjv17a030nyk0"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs `(("icecat" ,icecat)))
|
(inputs `(("icecat" ,icecat)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ;no tests
|
`(#:tests? #f ;no tests
|
||||||
#:make-flags '("CC=gcc")
|
#:make-flags `("CC=gcc"
|
||||||
|
,(string-append "PREFIX=" (assoc-ref %outputs "out")))
|
||||||
#:phases
|
#:phases
|
||||||
(alist-delete
|
(modify-phases %standard-phases
|
||||||
'configure
|
(delete 'configure)
|
||||||
(alist-replace
|
(add-after
|
||||||
'install
|
'install 'install-app-launcher
|
||||||
(lambda _
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
(begin
|
;; This overwrites the installed launcher, which execs xulrunner,
|
||||||
(use-modules (guix build utils))
|
;; with one that execs 'icecat --app'
|
||||||
(let* ((datadir (string-append %output "/share/conkeror"))
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
(bindir (string-append %output "/bin"))
|
(datadir (string-append out "/share/conkeror"))
|
||||||
(launcher (string-append bindir "/conkeror"))
|
(launcher (string-append out "/bin/conkeror")))
|
||||||
(spawn (string-append bindir "/conkeror-spawn-helper")))
|
(call-with-output-file launcher
|
||||||
(copy-recursively "." datadir)
|
(lambda (p)
|
||||||
(mkdir-p bindir)
|
(format p "#!~a/bin/bash
|
||||||
(copy-file "conkeror-spawn-helper" spawn)
|
|
||||||
(call-with-output-file launcher
|
|
||||||
(lambda (p)
|
|
||||||
(format p "#!~a/bin/bash
|
|
||||||
exec ~a/bin/icecat --app ~a \"$@\"~%"
|
exec ~a/bin/icecat --app ~a \"$@\"~%"
|
||||||
(assoc-ref %build-inputs "bash") ;implicit input
|
(assoc-ref inputs "bash") ;implicit input
|
||||||
(assoc-ref %build-inputs "icecat")
|
(assoc-ref inputs "icecat")
|
||||||
(string-append datadir
|
(string-append datadir
|
||||||
"/application.ini"))))
|
"/application.ini"))))
|
||||||
(chmod launcher #o555))))
|
(chmod launcher #o555)))))))
|
||||||
%standard-phases))))
|
|
||||||
(synopsis "Keyboard focused web browser with Emacs look and feel")
|
(synopsis "Keyboard focused web browser with Emacs look and feel")
|
||||||
(description "Conkeror is a highly-programmable web browser based on
|
(description "Conkeror is a highly-programmable web browser based on
|
||||||
Mozilla XULRunner which is the base of all Mozilla products including Firefox.
|
Mozilla XULRunner which is the base of all Mozilla products including Firefox.
|
||||||
|
|
@ -80,7 +76,7 @@ services (Search, Gmail, Maps, Reader, etc.), Del.icio.us, Reddit, Last.fm and
|
||||||
YouTube. For easier editing of form fields, it can spawn external editors.")
|
YouTube. For easier editing of form fields, it can spawn external editors.")
|
||||||
(home-page "http://conkeror.org")
|
(home-page "http://conkeror.org")
|
||||||
;; Conkeror is triple licensed.
|
;; Conkeror is triple licensed.
|
||||||
(license (list license:gpl2
|
(license (list
|
||||||
license:lgpl2.1
|
;; MPL 1.1 -- this license is not GPL compatible
|
||||||
;; MPL 1.1 -- this license is not GPL compatible
|
license:gpl2
|
||||||
))))
|
license:lgpl2.1))))
|
||||||
|
|
|
||||||
|
|
@ -35,17 +35,17 @@
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
"http://miller.emu.id.au/pmiller/software/cook/cook-" version
|
"http://miller.emu.id.au/pmiller/software/cook/cook-" version
|
||||||
".tar.gz"))
|
".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"104saqnqql1l7zr2pm3f718fdky3ds8j07c6xvwrs1rfkhrw58yw"))))
|
"104saqnqql1l7zr2pm3f718fdky3ds8j07c6xvwrs1rfkhrw58yw"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:parallel-build? #f ; There are some nasty racy rules in the Makefile.
|
`(#:parallel-build? #f ; There are some nasty racy rules in the Makefile.
|
||||||
#:phases
|
#:phases
|
||||||
(alist-cons-before
|
(alist-cons-before
|
||||||
'configure 'pre-conf
|
'configure 'pre-conf
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* (append '("common/env.c")
|
(substitute* (append '("common/env.c")
|
||||||
(find-files "test" "\\.sh"))
|
(find-files "test" "\\.sh"))
|
||||||
(("/bin/sh") (which "sh")))
|
(("/bin/sh") (which "sh")))
|
||||||
|
|
@ -57,7 +57,7 @@
|
||||||
;; which plays havoc with this test, for which correct timestamps
|
;; which plays havoc with this test, for which correct timestamps
|
||||||
;; are very important. Adding the U flag undoes the effect of
|
;; are very important. Adding the U flag undoes the effect of
|
||||||
;; --enable-deterministic-archives and allows this test to work
|
;; --enable-deterministic-archives and allows this test to work
|
||||||
;; again.
|
;; again.
|
||||||
(substitute* "test/00/t0077a.sh"
|
(substitute* "test/00/t0077a.sh"
|
||||||
(("ar qc") "ar qcU"))
|
(("ar qc") "ar qcU"))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2014 David Thompson <davet@gnu.org>
|
;;; Copyright © 2014 David Thompson <davet@gnu.org>
|
||||||
|
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
|
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
|
||||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
|
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
|
||||||
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
||||||
|
|
@ -39,14 +39,14 @@
|
||||||
(define-public curl
|
(define-public curl
|
||||||
(package
|
(package
|
||||||
(name "curl")
|
(name "curl")
|
||||||
(version "7.44.0")
|
(version "7.45.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://curl.haxx.se/download/curl-"
|
(uri (string-append "http://curl.haxx.se/download/curl-"
|
||||||
version ".tar.lzma"))
|
version ".tar.lzma"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0gjnaav9vmwwwza451na1643br7i0kxgd4002pwqh3xk5ywvdap7"))))
|
"0bamqik0mi2rmai016iakwrwmsz0s5xad1ghkbwsd3zkv08rgkcn"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(outputs '("out"
|
(outputs '("out"
|
||||||
"doc")) ;1.2 MiB of man3 pages
|
"doc")) ;1.2 MiB of man3 pages
|
||||||
|
|
@ -95,8 +95,8 @@
|
||||||
;; test 1510...[HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)]
|
;; test 1510...[HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)]
|
||||||
;;
|
;;
|
||||||
;; 1510: output (log/stderr1510) FAILED:
|
;; 1510: output (log/stderr1510) FAILED:
|
||||||
;; --- log/check-expected 2015-06-27 07:45:53.166720834 +0000
|
;; --- log/check-expected 2015-06-27 07:45:53.166720834 +0000
|
||||||
;; +++ log/check-generated 2015-06-27 07:45:53.166720834 +0000
|
;; +++ log/check-generated 2015-06-27 07:45:53.166720834 +0000
|
||||||
;; @@ -1,5 +1,5 @@
|
;; @@ -1,5 +1,5 @@
|
||||||
;; * Connection #0 to host server1.example.com left intact[LF]
|
;; * Connection #0 to host server1.example.com left intact[LF]
|
||||||
;; * Connection #1 to host server2.example.com left intact[LF]
|
;; * Connection #1 to host server2.example.com left intact[LF]
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
(define-module (gnu packages cyrus-sasl)
|
(define-module (gnu packages cyrus-sasl)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
#:use-module (gnu packages gdbm)
|
#:use-module (gnu packages databases)
|
||||||
#:use-module (gnu packages mit-krb5)
|
#:use-module (gnu packages mit-krb5)
|
||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages tls)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,28 @@
|
||||||
#:use-module (srfi srfi-26)
|
#:use-module (srfi srfi-26)
|
||||||
#:use-module (ice-9 match))
|
#:use-module (ice-9 match))
|
||||||
|
|
||||||
|
(define-public gdbm
|
||||||
|
(package
|
||||||
|
(name "gdbm")
|
||||||
|
(version "1.11")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "mirror://gnu/gdbm/gdbm-"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1hz3jgh3pd4qzp6jy0l8pd8x01g9abw7csnrlnj1a2sxy122z4cd"))))
|
||||||
|
(arguments `(#:configure-flags '("--enable-libgdbm-compat")))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(home-page "http://www.gnu.org/software/gdbm/")
|
||||||
|
(synopsis
|
||||||
|
"Hash library of database functions compatible with traditional dbm")
|
||||||
|
(description
|
||||||
|
"GDBM is a library for manipulating hashed databases. It is used to
|
||||||
|
store key/value pairs in a file in a manner similar to the Unix dbm library
|
||||||
|
and provides interfaces to the traditional file format.")
|
||||||
|
(license gpl3+)))
|
||||||
|
|
||||||
(define-public bdb
|
(define-public bdb
|
||||||
(package
|
(package
|
||||||
(name "bdb")
|
(name "bdb")
|
||||||
|
|
@ -602,6 +624,30 @@ columns, primary keys, unique constraints and relationships.")
|
||||||
(description "")
|
(description "")
|
||||||
(license (package-license perl))))
|
(license (package-license perl))))
|
||||||
|
|
||||||
|
(define-public perl-dbd-mysql
|
||||||
|
(package
|
||||||
|
(name "perl-dbd-mysql")
|
||||||
|
(version "4.033")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "mirror://cpan/authors/id/C/CA/CAPTTOFU/"
|
||||||
|
"DBD-mysql-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0769xakykps0cx368g4vaips4w3bjk383rianiavq7sq6g6bp66c"))))
|
||||||
|
(build-system perl-build-system)
|
||||||
|
;; Tests require running MySQL server
|
||||||
|
(arguments `(#:tests? #f))
|
||||||
|
(propagated-inputs
|
||||||
|
`(("perl-dbi" ,perl-dbi)
|
||||||
|
("mysql" ,mysql)))
|
||||||
|
(home-page "http://search.cpan.org/dist/DBD-mysql")
|
||||||
|
(synopsis "DBI MySQL interface")
|
||||||
|
(description "This package provides a MySQL driver for the Perl5
|
||||||
|
@dfn{Database Interface} (DBI).")
|
||||||
|
(license (package-license perl))))
|
||||||
|
|
||||||
(define-public perl-dbd-sqlite
|
(define-public perl-dbd-sqlite
|
||||||
(package
|
(package
|
||||||
(name "perl-dbd-sqlite")
|
(name "perl-dbd-sqlite")
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,49 @@
|
||||||
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
|
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||||
|
;;;
|
||||||
|
;;; This file is part of GNU Guix.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||||
|
;;; under the terms of the GNU General Public License as published by
|
||||||
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||||
|
;;; your option) any later version.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||||
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
;;; GNU General Public License for more details.
|
||||||
|
;;;
|
||||||
|
;;; You should have received a copy of the GNU General Public License
|
||||||
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
(define-module (gnu packages datastructures)
|
||||||
|
#:use-module (gnu packages)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix build-system gnu))
|
||||||
|
|
||||||
|
(define-public sparsehash
|
||||||
|
(package
|
||||||
|
(name "sparsehash")
|
||||||
|
(version "2.0.3")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "https://github.com/sparsehash/sparsehash/"
|
||||||
|
"archive/sparsehash-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"133szz0ldwch0kd91l0sa57qsnl020njn622szd9cxrjqyjqds85"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(synopsis "Memory-efficient hashtable implementations")
|
||||||
|
(description
|
||||||
|
"This library contains several hash-map implementations, similar in API
|
||||||
|
to SGI's @code{hash_map} class, but with different performance
|
||||||
|
characteristics. @code{sparse_hash_map} uses very little space overhead, 1-2
|
||||||
|
bits per entry. @code{dense_hash_map} is very fast, particulary on lookup.
|
||||||
|
@code{sparse_hash_set} and @code{dense_hash_set} are the set versions of these
|
||||||
|
routines. All these implementation use a hashtable with internal quadratic
|
||||||
|
probing. This method is space-efficient -- there is no pointer overhead --
|
||||||
|
and time-efficient for good hash functions.")
|
||||||
|
(home-page "https://github.com/sparsehash/sparsehash")
|
||||||
|
(license license:bsd-3)))
|
||||||
|
|
@ -141,6 +141,24 @@ intended for use by people who discover and report bugs in compilers and other
|
||||||
tools that process C/C++ code.")
|
tools that process C/C++ code.")
|
||||||
(license ncsa)))
|
(license ncsa)))
|
||||||
|
|
||||||
|
(define qemu-2.3.0
|
||||||
|
(package
|
||||||
|
(inherit qemu-minimal)
|
||||||
|
(version "2.3.0")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"http://wiki.qemu-project.org/download/qemu-"
|
||||||
|
version ".tar.bz2"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"120m53c3p28qxmfzllicjzr8syjv6v4d9rsyrgkp7gnmcgvvgfmn"))))
|
||||||
|
(arguments
|
||||||
|
;; XXX: Disable tests because of GTester's rejection of duplicate test
|
||||||
|
;; names, which wasn't addressed in this version of QEMU.
|
||||||
|
`(#:tests? #f
|
||||||
|
,@(package-arguments qemu-minimal)))))
|
||||||
|
|
||||||
(define-public american-fuzzy-lop
|
(define-public american-fuzzy-lop
|
||||||
(let ((machine (match (or (%current-target-system)
|
(let ((machine (match (or (%current-target-system)
|
||||||
(%current-system))
|
(%current-system))
|
||||||
|
|
@ -164,11 +182,11 @@ tools that process C/C++ code.")
|
||||||
(inputs
|
(inputs
|
||||||
`(("custom-qemu"
|
`(("custom-qemu"
|
||||||
;; The afl-qemu tool builds qemu 2.3.0 with a few patches applied.
|
;; The afl-qemu tool builds qemu 2.3.0 with a few patches applied.
|
||||||
,(package (inherit qemu-headless)
|
,(package (inherit qemu-2.3.0)
|
||||||
(name "afl-qemu")
|
(name "afl-qemu")
|
||||||
(inputs
|
(inputs
|
||||||
`(("afl-src" ,source)
|
`(("afl-src" ,source)
|
||||||
,@(package-inputs qemu-headless)))
|
,@(package-inputs qemu-2.3.0)))
|
||||||
;; afl only supports using a single afl-qemu-trace executable, so
|
;; afl only supports using a single afl-qemu-trace executable, so
|
||||||
;; we only build qemu for the native target.
|
;; we only build qemu for the native target.
|
||||||
(arguments
|
(arguments
|
||||||
|
|
@ -176,7 +194,7 @@ tools that process C/C++ code.")
|
||||||
(list (string-append "--target-list=" ,machine "-linux-user"))
|
(list (string-append "--target-list=" ,machine "-linux-user"))
|
||||||
#:modules ((srfi srfi-1)
|
#:modules ((srfi srfi-1)
|
||||||
,@%gnu-build-system-modules)
|
,@%gnu-build-system-modules)
|
||||||
,@(substitute-keyword-arguments (package-arguments qemu-headless)
|
,@(substitute-keyword-arguments (package-arguments qemu-2.3.0)
|
||||||
((#:phases qemu-phases)
|
((#:phases qemu-phases)
|
||||||
`(modify-phases ,qemu-phases
|
`(modify-phases ,qemu-phases
|
||||||
(add-after
|
(add-after
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,80 @@
|
||||||
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
|
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
||||||
|
;;;
|
||||||
|
;;; This file is part of GNU Guix.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||||
|
;;; under the terms of the GNU General Public License as published by
|
||||||
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||||
|
;;; your option) any later version.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||||
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
;;; GNU General Public License for more details.
|
||||||
|
;;;
|
||||||
|
;;; You should have received a copy of the GNU General Public License
|
||||||
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
(define-module (gnu packages dico)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module ((guix licenses) #:select (gpl3+))
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (gnu packages)
|
||||||
|
#:use-module (gnu packages readline)
|
||||||
|
#:use-module (gnu packages m4)
|
||||||
|
#:use-module (gnu packages guile)
|
||||||
|
#:use-module (gnu packages python)
|
||||||
|
#:use-module (gnu packages pcre)
|
||||||
|
#:use-module (gnu packages gsasl)
|
||||||
|
#:use-module (gnu packages autotools)
|
||||||
|
#:use-module (gnu packages compression)
|
||||||
|
#:use-module (gnu packages wordnet))
|
||||||
|
|
||||||
|
(define-public dico
|
||||||
|
(package
|
||||||
|
(name "dico")
|
||||||
|
(version "2.2")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "mirror://gnu/dico/dico-"
|
||||||
|
version ".tar.xz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"04pjks075x20d19l623mj50bw64g8i41s63z4kzzqcbg9qg96x64"))
|
||||||
|
(patches (map search-patch
|
||||||
|
'("cpio-gets-undeclared.patch"
|
||||||
|
"dico-libtool-deterministic.patch")))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
'(#:configure-flags (list (string-append "--with-guile-site-dir=" %output
|
||||||
|
"/share/guile/site/2.0"))
|
||||||
|
#:make-flags '("V=1")
|
||||||
|
#:phases (modify-phases %standard-phases
|
||||||
|
(add-before 'check 'silence-guile
|
||||||
|
(lambda _
|
||||||
|
;; Guile is too talkative, which disturbs the test
|
||||||
|
;; infrastructure. Gag it.
|
||||||
|
(setenv "GUILE_AUTO_COMPILE" "0")
|
||||||
|
(setenv "GUILE_WARN_DEPRECATED" "no")
|
||||||
|
#t)))))
|
||||||
|
(inputs
|
||||||
|
`(("m4" ,m4) ;used at run time
|
||||||
|
("pcre" ,pcre)
|
||||||
|
;; ("python" ,python-2)
|
||||||
|
("guile" ,guile-2.0)
|
||||||
|
("gsasl" ,gsasl)
|
||||||
|
("readline" ,readline-6.2)
|
||||||
|
("zlib" ,zlib)
|
||||||
|
;; ("wordnet" ,wordnet) ;FIXME: link failure
|
||||||
|
("libltdl" ,libltdl)))
|
||||||
|
(home-page "http://www.gnu.org/software/dico/")
|
||||||
|
(synopsis "Implementation of DICT server (RFC 2229)")
|
||||||
|
(description
|
||||||
|
"GNU Dico implements a flexible dictionary server and client according to
|
||||||
|
RFC 2229 (DICT Server). It is able to access any database available,
|
||||||
|
regardless of format, thanks to its modular structure. New modules may be
|
||||||
|
written in C, Guile or Python. Dico also includes a command-line client,
|
||||||
|
which may be used to query remote dictionary databases.")
|
||||||
|
(license gpl3+)))
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
|
;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
|
||||||
|
;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
|
||||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
|
|
@ -22,9 +23,10 @@
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (gnu packages check)
|
|
||||||
#:use-module (gnu packages gettext)
|
#:use-module (gnu packages gettext)
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
|
#:use-module (gnu packages perl)
|
||||||
|
#:use-module (gnu packages python)
|
||||||
#:use-module (gnu packages readline)
|
#:use-module (gnu packages readline)
|
||||||
#:use-module (gnu packages guile)
|
#:use-module (gnu packages guile)
|
||||||
#:use-module ((gnu packages compression)
|
#:use-module ((gnu packages compression)
|
||||||
|
|
@ -33,39 +35,35 @@
|
||||||
(define-public parted
|
(define-public parted
|
||||||
(package
|
(package
|
||||||
(name "parted")
|
(name "parted")
|
||||||
(version "3.1")
|
(version "3.2")
|
||||||
(source
|
(source (origin
|
||||||
(origin
|
(method url-fetch)
|
||||||
(method url-fetch)
|
(uri (string-append "mirror://gnu/parted/parted-"
|
||||||
(uri (string-append "mirror://gnu/parted/parted-"
|
version ".tar.xz"))
|
||||||
version ".tar.xz"))
|
(sha256
|
||||||
(sha256
|
(base32
|
||||||
(base32
|
"1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5"))))
|
||||||
"05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y"))))
|
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments `(#:configure-flags '("--disable-device-mapper")
|
(arguments
|
||||||
#:phases (alist-cons-before
|
`(#:phases
|
||||||
'configure 'fix-mkswap
|
(modify-phases %standard-phases
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(add-after
|
||||||
(let ((util-linux (assoc-ref inputs
|
'unpack 'fix-locales-and-python
|
||||||
"util-linux")))
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(substitute*
|
(substitute* "tests/t0251-gpt-unicode.sh"
|
||||||
"tests/t9050-partition-table-types.sh"
|
(("C.UTF-8") "en_US.utf8")) ;not in Glibc locales
|
||||||
(("mkswap")
|
(substitute* "tests/msdos-overlap"
|
||||||
(string-append util-linux "/sbin/mkswap")))))
|
(("/usr/bin/python") (which "python"))))))))
|
||||||
%standard-phases)))
|
|
||||||
(inputs
|
(inputs
|
||||||
;; XXX: add 'lvm2'.
|
`(("lvm2" ,lvm2)
|
||||||
`(("check" ,check)
|
("readline" ,readline)
|
||||||
|
|
||||||
;; With Readline 6.3, parted/ui.c fails to build because it uses the
|
|
||||||
;; now undefined 'CPPFunction' type.
|
|
||||||
("readline" ,readline-6.2)
|
|
||||||
|
|
||||||
("util-linux" ,util-linux)))
|
("util-linux" ,util-linux)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("gettext" ,gnu-gettext)))
|
`(("gettext" ,gnu-gettext)
|
||||||
(home-page "http://www.gnu.org/software/parted/")
|
;; For the tests.
|
||||||
|
("perl" ,perl)
|
||||||
|
("python" ,python-2)))
|
||||||
|
(home-page "https://www.gnu.org/software/parted/")
|
||||||
(synopsis "Disk partition editor")
|
(synopsis "Disk partition editor")
|
||||||
(description
|
(description
|
||||||
"GNU Parted is a package for creating and manipulating disk partition
|
"GNU Parted is a package for creating and manipulating disk partition
|
||||||
|
|
@ -124,7 +122,7 @@ to recover data more efficiently by only reading the necessary blocks.")
|
||||||
(define-public dosfstools
|
(define-public dosfstools
|
||||||
(package
|
(package
|
||||||
(name "dosfstools")
|
(name "dosfstools")
|
||||||
(version "3.0.27")
|
(version "3.0.28")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -133,7 +131,7 @@ to recover data more efficiently by only reading the necessary blocks.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1a2qs5g2zqbk1gzaaf4v3fw3yny6jgbzddpgcamkp3fjifn8wxl5"))))
|
"1qkya6lald91c8nsf29jwnk0k5v42wlj24gacfdp3wpc8hq935gf"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:make-flags (list (string-append "PREFIX=" %output)
|
`(#:make-flags (list (string-append "PREFIX=" %output)
|
||||||
|
|
|
||||||
|
|
@ -134,8 +134,9 @@ by no means limited to these applications.) This package provides XML DTDs.")
|
||||||
(string-append xsl "/" name-version))
|
(string-append xsl "/" name-version))
|
||||||
|
|
||||||
(substitute* (string-append xsl "/" name-version "/catalog.xml")
|
(substitute* (string-append xsl "/" name-version "/catalog.xml")
|
||||||
(("rewritePrefix=\"./")
|
(("rewritePrefix=\"./")
|
||||||
(string-append "rewritePrefix=\"file://" xsl "/" name-version "/")))))
|
(string-append "rewritePrefix=\"file://" xsl "/"
|
||||||
|
name-version "/")))))
|
||||||
#:modules ((guix build utils))))
|
#:modules ((guix build utils))))
|
||||||
(native-inputs `(("bzip2" ,bzip2)
|
(native-inputs `(("bzip2" ,bzip2)
|
||||||
("tar" ,tar)))
|
("tar" ,tar)))
|
||||||
|
|
|
||||||
|
|
@ -227,13 +227,14 @@ metadata.")
|
||||||
(define-public paredit
|
(define-public paredit
|
||||||
(package
|
(package
|
||||||
(name "paredit")
|
(name "paredit")
|
||||||
(version "23")
|
(version "24")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://mumble.net/~campbell/emacs/paredit-"
|
(uri (string-append "http://mumble.net/~campbell/emacs/paredit-"
|
||||||
version ".el"))
|
version ".el"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1np882jzvxckljx3cjz4absyzmc5hw65cs21sjmbic82163m9lf8"))))
|
(base32
|
||||||
|
"0pp3n8q6kc70blqsaw0zlzp6bc327dpgdrjr0cnh7hqg1lras7ka"))))
|
||||||
(build-system trivial-build-system)
|
(build-system trivial-build-system)
|
||||||
(inputs `(("emacs" ,emacs-no-x)))
|
(inputs `(("emacs" ,emacs-no-x)))
|
||||||
(arguments
|
(arguments
|
||||||
|
|
@ -317,7 +318,7 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.")
|
||||||
(define-public magit
|
(define-public magit
|
||||||
(package
|
(package
|
||||||
(name "magit")
|
(name "magit")
|
||||||
(version "2.2.2")
|
(version "2.3.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -325,7 +326,7 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.")
|
||||||
version "/" name "-" version ".tar.gz"))
|
version "/" name "-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1imkj4prprnivhbpdn1mdpiryxkckzy5hbnqaahv7gixwac1irh8"))))
|
"1wnx034adkwhbsydd10il2099hpzz351kp39sri8s1yd43f795gf"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs `(("texinfo" ,texinfo)
|
(native-inputs `(("texinfo" ,texinfo)
|
||||||
("emacs" ,emacs-no-x)))
|
("emacs" ,emacs-no-x)))
|
||||||
|
|
@ -373,7 +374,7 @@ operations.")
|
||||||
(define-public magit-svn
|
(define-public magit-svn
|
||||||
(package
|
(package
|
||||||
(name "magit-svn")
|
(name "magit-svn")
|
||||||
(version "2.1.0")
|
(version "2.1.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -382,7 +383,7 @@ operations.")
|
||||||
(file-name (string-append name "-" version ".tar.gz"))
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"09sz93g7x7g9q75jsw8bdh7yr4jr1igfb4fpg5i302a7l2ahxfr8"))))
|
"04y88j7q9h8xjbx5dbick6n5nr1522sn9i1znp0qwk3vjb4b5mzz"))))
|
||||||
(build-system trivial-build-system)
|
(build-system trivial-build-system)
|
||||||
(native-inputs `(("emacs" ,emacs-no-x)
|
(native-inputs `(("emacs" ,emacs-no-x)
|
||||||
("tar" ,tar)
|
("tar" ,tar)
|
||||||
|
|
@ -574,13 +575,14 @@ provides an optional IDE-like error list.")
|
||||||
(define-public emacs-w3m
|
(define-public emacs-w3m
|
||||||
(package
|
(package
|
||||||
(name "emacs-w3m")
|
(name "emacs-w3m")
|
||||||
(version "1.4.483+0.20120614")
|
(version "1.4.538+0.20141022")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://debian/pool/main/w/w3m-el/w3m-el_"
|
(uri (string-append "mirror://debian/pool/main/w/w3m-el/w3m-el_"
|
||||||
version ".orig.tar.gz"))
|
version ".orig.tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0ms181gjavnfk79hhv5xl9llik4c6kj0w3c04kgyif8lcy2sxljx"))))
|
(base32
|
||||||
|
"0zfxmq86pwk64yv0426gnjrvhjrgrjqn08sdcdhmmjmfpmqvm79y"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs `(("autoconf" ,autoconf)))
|
(native-inputs `(("autoconf" ,autoconf)))
|
||||||
(inputs `(("w3m" ,w3m)
|
(inputs `(("w3m" ,w3m)
|
||||||
|
|
@ -597,43 +599,46 @@ provides an optional IDE-like error list.")
|
||||||
(list (string-append "--with-lispdir="
|
(list (string-append "--with-lispdir="
|
||||||
out "/share/emacs/site-lisp")
|
out "/share/emacs/site-lisp")
|
||||||
(string-append "--with-icondir="
|
(string-append "--with-icondir="
|
||||||
out "/share/images/emacs-w3m")))
|
out "/share/images/emacs-w3m")
|
||||||
|
;; Leave .el files uncompressed, otherwise GC can't
|
||||||
|
;; identify run-time dependencies. See
|
||||||
|
;; <http://lists.gnu.org/archive/html/guix-devel/2015-12/msg00208.html>
|
||||||
|
"--without-compress-install"))
|
||||||
#:tests? #f ; no check target
|
#:tests? #f ; no check target
|
||||||
#:phases
|
#:phases
|
||||||
(alist-cons-after
|
(modify-phases %standard-phases
|
||||||
'unpack 'autoconf
|
(add-after 'unpack 'autoconf
|
||||||
(lambda _
|
(lambda _
|
||||||
(zero? (system* "autoconf")))
|
(zero? (system* "autoconf"))))
|
||||||
(alist-cons-before
|
(add-before 'build 'patch-exec-paths
|
||||||
'build 'patch-exec-paths
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
(let ((out (assoc-ref outputs "out"))
|
||||||
(let ((out (assoc-ref outputs "out"))
|
(w3m (assoc-ref inputs "w3m"))
|
||||||
(w3m (assoc-ref inputs "w3m"))
|
(imagemagick (assoc-ref inputs "imagemagick"))
|
||||||
(imagemagick (assoc-ref inputs "imagemagick"))
|
(coreutils (assoc-ref inputs "coreutils")))
|
||||||
(coreutils (assoc-ref inputs "coreutils")))
|
(emacs-substitute-variables "w3m.el"
|
||||||
(emacs-substitute-variables "w3m.el"
|
("w3m-command" (string-append w3m "/bin/w3m"))
|
||||||
("w3m-command" (string-append w3m "/bin/w3m"))
|
("w3m-touch-command"
|
||||||
("w3m-touch-command" (string-append coreutils "/bin/touch"))
|
(string-append coreutils "/bin/touch"))
|
||||||
("w3m-image-viewer" (string-append imagemagick "/bin/display"))
|
("w3m-image-viewer"
|
||||||
("w3m-icon-directory" (string-append out
|
(string-append imagemagick "/bin/display"))
|
||||||
"/share/images/emacs-w3m")))
|
("w3m-icon-directory"
|
||||||
(emacs-substitute-variables "w3m-image.el"
|
(string-append out "/share/images/emacs-w3m")))
|
||||||
("w3m-imagick-convert-program" (string-append imagemagick
|
(emacs-substitute-variables "w3m-image.el"
|
||||||
"/bin/convert"))
|
("w3m-imagick-convert-program"
|
||||||
("w3m-imagick-identify-program" (string-append imagemagick
|
(string-append imagemagick "/bin/convert"))
|
||||||
"/bin/identify")))
|
("w3m-imagick-identify-program"
|
||||||
#t))
|
(string-append imagemagick "/bin/identify")))
|
||||||
(alist-replace
|
#t)))
|
||||||
'install
|
(replace 'install
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(and (zero? (system* "make" "install" "install-icons"))
|
(and (zero? (system* "make" "install" "install-icons"))
|
||||||
(with-directory-excursion
|
(with-directory-excursion
|
||||||
(string-append (assoc-ref outputs "out")
|
(string-append (assoc-ref outputs "out")
|
||||||
"/share/emacs/site-lisp")
|
"/share/emacs/site-lisp")
|
||||||
(for-each delete-file '("ChangeLog" "ChangeLog.1"))
|
(for-each delete-file '("ChangeLog" "ChangeLog.1"))
|
||||||
(symlink "w3m-load.el" "w3m-autoloads.el")
|
(symlink "w3m-load.el" "w3m-autoloads.el")
|
||||||
#t)))
|
#t)))))))
|
||||||
%standard-phases)))))
|
|
||||||
(home-page "http://emacs-w3m.namazu.org/")
|
(home-page "http://emacs-w3m.namazu.org/")
|
||||||
(synopsis "Simple Web browser for Emacs based on w3m")
|
(synopsis "Simple Web browser for Emacs based on w3m")
|
||||||
(description
|
(description
|
||||||
|
|
@ -912,7 +917,7 @@ single buffer.")
|
||||||
(define-public emacs-pdf-tools
|
(define-public emacs-pdf-tools
|
||||||
(package
|
(package
|
||||||
(name "emacs-pdf-tools")
|
(name "emacs-pdf-tools")
|
||||||
(version "0.60")
|
(version "0.70")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -921,7 +926,7 @@ single buffer.")
|
||||||
(file-name (string-append name "-" version ".tar.gz"))
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1y8k5n2jbyaxby0j6f4m9xbm0ddpmbkrfj6rp6ll5sb97lcg3vrx"))))
|
"1m0api6wiawswyk46bdsyk6r5rg3b86a4paar6nassm6x6c6vr77"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; there are no tests
|
`(#:tests? #f ; there are no tests
|
||||||
|
|
@ -981,7 +986,7 @@ and stored in memory.")
|
||||||
(define-public emacs-dash
|
(define-public emacs-dash
|
||||||
(package
|
(package
|
||||||
(name "emacs-dash")
|
(name "emacs-dash")
|
||||||
(version "2.11.0")
|
(version "2.12.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -990,7 +995,7 @@ and stored in memory.")
|
||||||
(file-name (string-append name "-" version ".tar.gz"))
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1piwcwilkxcbjxx832mhb7q3pz1fgwp203r581bpqcw6kd5x726q"))))
|
"082jl7mp4x063bpj5ad2pc5125k0d6p7rb89gcj7ny3lma9h2ij1"))))
|
||||||
(build-system emacs-build-system)
|
(build-system emacs-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:phases
|
||||||
|
|
@ -1024,7 +1029,7 @@ and stored in memory.")
|
||||||
(lambda _
|
(lambda _
|
||||||
(zero? (system* "./run-tests.sh")))))))
|
(zero? (system* "./run-tests.sh")))))))
|
||||||
(home-page "https://github.com/magnars/s.el")
|
(home-page "https://github.com/magnars/s.el")
|
||||||
(synopsis "Emacs string manipulation library.")
|
(synopsis "Emacs string manipulation library")
|
||||||
(description "This package provides an Emacs library for manipulating
|
(description "This package provides an Emacs library for manipulating
|
||||||
strings.")
|
strings.")
|
||||||
(license license:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
|
||||||
|
|
@ -140,7 +140,7 @@ plans and designs.")
|
||||||
(home-page "http://geda-project.org/")
|
(home-page "http://geda-project.org/")
|
||||||
(synopsis "Schematic capture, netlister, symbols, symbol checker, and utils")
|
(synopsis "Schematic capture, netlister, symbols, symbol checker, and utils")
|
||||||
(description
|
(description
|
||||||
"gaf stands for “gschem and friends”. It is a subset of the entire tool
|
"Gaf stands for “gschem and friends”. It is a subset of the entire tool
|
||||||
suite grouped together under the gEDA name. gEDA/gaf is a collection of tools
|
suite grouped together under the gEDA name. gEDA/gaf is a collection of tools
|
||||||
which currently includes: gschem, a schematic capture program; gnetlist, a
|
which currently includes: gschem, a schematic capture program; gnetlist, a
|
||||||
netlist generation program; gsymcheck, a syntax checker for schematic symbols;
|
netlist generation program; gsymcheck, a syntax checker for schematic symbols;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
|
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
|
||||||
;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org>
|
;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org>
|
||||||
|
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -51,7 +52,7 @@
|
||||||
(define-public efl
|
(define-public efl
|
||||||
(package
|
(package
|
||||||
(name "efl")
|
(name "efl")
|
||||||
(version "1.15.2")
|
(version "1.16.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -59,7 +60,7 @@
|
||||||
version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1962wqx7gdnpzvnkbighyn4hj5vw8l4c1d7xl5zilqjlyhcqywyx"))))
|
"08w3hrjyz1yjqjq77px86fljxxi5xz5yfy79qwssypafjvcvpzky"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)))
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
|
@ -134,7 +135,7 @@ removable devices or support for multimedia.")
|
||||||
(define-public elementary
|
(define-public elementary
|
||||||
(package
|
(package
|
||||||
(name "elementary")
|
(name "elementary")
|
||||||
(version "1.15.2")
|
(version "1.16.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri
|
(uri
|
||||||
|
|
@ -142,7 +143,7 @@ removable devices or support for multimedia.")
|
||||||
"elementary/elementary-" version ".tar.xz"))
|
"elementary/elementary-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0gqg98bglnl2jggdzxzrh9r7bv32i4sahspms0bihq8b45rk0g2j"))))
|
"1546b7pdpw6nx1hjxy674zr8dgpzwl7lq3hvnv4axkpd4zwkqgs8"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)))
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
|
@ -159,7 +160,7 @@ full capabilities of EFL.")
|
||||||
(define-public evas-generic-loaders
|
(define-public evas-generic-loaders
|
||||||
(package
|
(package
|
||||||
(name "evas-generic-loaders")
|
(name "evas-generic-loaders")
|
||||||
(version "1.15.0")
|
(version "1.16.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri
|
(uri
|
||||||
|
|
@ -169,7 +170,7 @@ full capabilities of EFL.")
|
||||||
version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0zzx06j20x580xqnnsxp7gb7rv279zcgvdxfbhs905af9m6rwlqy"))))
|
"1il3i3rii6ddpj7cw2mdqnb0q2wmhwnvs6qi9janna1n5hhrqyfm"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)))
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
|
@ -191,7 +192,7 @@ files in Evas (EFL canvas library).")
|
||||||
(define-public emotion-generic-players
|
(define-public emotion-generic-players
|
||||||
(package
|
(package
|
||||||
(name "emotion-generic-players")
|
(name "emotion-generic-players")
|
||||||
(version "1.15.0")
|
(version "1.16.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri
|
(uri
|
||||||
|
|
@ -200,7 +201,7 @@ files in Evas (EFL canvas library).")
|
||||||
"-" version ".tar.xz"))
|
"-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0pszwmcygxnv1sfx0m79md2jmi4sng8mdb1xcr6h2z5c8685wvcz"))))
|
"163ay26c6dx49m1am7vsxxn0gy877zhayxq0yxn9zkbq2srzvjym"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)))
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
|
@ -270,16 +271,18 @@ Libraries with some extra bells and whistles.")
|
||||||
(define-public enlightenment
|
(define-public enlightenment
|
||||||
(package
|
(package
|
||||||
(name "enlightenment")
|
(name "enlightenment")
|
||||||
(version "0.19.12")
|
(version "0.20.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri
|
(uri
|
||||||
(string-append "https://download.enlightenment.org/rel/apps/"
|
(string-append "https://download.enlightenment.org/rel/apps/"
|
||||||
name "/" name "-" version ".tar.xz"))
|
name "/" name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"098bdx9qmv1yqqwfydrzs7fvbnhsf3vaib9pmqsyg4ihgqrkrwjm"))))
|
"0mwiim0nv640v3af7qxc5ajfk702qkl5c1cnqlhz6rqzr5yjapxv"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
`(#:configure-flags '("--enable-mount-eeze")))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)))
|
`(("pkg-config" ,pkg-config)))
|
||||||
(inputs
|
(inputs
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,7 @@
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"16jbj8avg5jkgvq5lxm0hdxxn4c3zn7fx8b4nxllvr024apk9w23"))
|
"16jbj8avg5jkgvq5lxm0hdxxn4c3zn7fx8b4nxllvr024apk9w23"))
|
||||||
|
(file-name (string-append name "-" version "-checkout"))
|
||||||
(patches (list (search-patch "ath9k-htc-firmware-objcopy.patch")))))
|
(patches (list (search-patch "ath9k-htc-firmware-objcopy.patch")))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@
|
||||||
#:use-module (guix licenses)
|
#:use-module (guix licenses)
|
||||||
#:use-module (gnu packages doxygen)
|
#:use-module (gnu packages doxygen)
|
||||||
#:use-module (gnu packages ncurses)
|
#:use-module (gnu packages ncurses)
|
||||||
|
#:use-module (gnu packages python)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
|
|
@ -45,7 +46,8 @@
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("doxygen" ,doxygen)))
|
`(("doxygen" ,doxygen)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("ncurses" ,ncurses)))
|
`(("ncurses" ,ncurses)
|
||||||
|
("python" ,python-wrapper))) ;for fish_config and manpage completions
|
||||||
(arguments
|
(arguments
|
||||||
'(#:tests? #f ; no check target
|
'(#:tests? #f ; no check target
|
||||||
#:configure-flags '("--sysconfdir=/etc")))
|
#:configure-flags '("--sysconfdir=/etc")))
|
||||||
|
|
|
||||||
|
|
@ -390,17 +390,17 @@ for long (8 and more hours per day) work with computers.")
|
||||||
(define-public font-adobe-source-han-sans
|
(define-public font-adobe-source-han-sans
|
||||||
(package
|
(package
|
||||||
(name "font-adobe-source-han-sans")
|
(name "font-adobe-source-han-sans")
|
||||||
(version "1.001R")
|
(version "1.004")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
"https://github.com/adobe-fonts/source-han-sans/archive/"
|
"https://github.com/adobe-fonts/source-han-sans/archive/"
|
||||||
version ".tar.gz"))
|
version "R.tar.gz"))
|
||||||
(file-name (string-append "source-han-sans-" version ".tar.gz"))
|
(file-name (string-append "source-han-sans-" version "R.tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0cwz3d8jancl0a7vbjxhnh1vgwsjba62lahfjya9yrjkp1ndxlap"))))
|
"1ssx0fw90sy6mj8fv8fv4dgzszpqwbmwpjnlx16g4pvaqzdmybbz"))))
|
||||||
(outputs '("out" ; OpenType/CFF Collection (OTC), 119 MiB.
|
(outputs '("out" ; OpenType/CFF Collection (OTC), 121 MiB.
|
||||||
"cn" "jp" "kr" "tw")) ; Region-specific Subset OpenType/CFF.
|
"cn" "jp" "kr" "tw")) ; Region-specific Subset OpenType/CFF.
|
||||||
(build-system trivial-build-system)
|
(build-system trivial-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
|
|
@ -421,12 +421,13 @@ for long (8 and more hours per day) work with computers.")
|
||||||
"/share/fonts/opentype")))))
|
"/share/fonts/opentype")))))
|
||||||
(setenv "PATH" PATH)
|
(setenv "PATH" PATH)
|
||||||
(system* tar "xvf" (assoc-ref %build-inputs "source"))
|
(system* tar "xvf" (assoc-ref %build-inputs "source"))
|
||||||
(chdir (string-append "source-han-sans-" ,version))
|
(chdir (string-append "source-han-sans-" ,version "R"))
|
||||||
(install-opentype-fonts "OTC" "out")
|
(install-opentype-fonts "OTC" "out")
|
||||||
(install-opentype-fonts "SubsetOTF/CN" "cn")
|
(install-opentype-fonts "SubsetOTF/CN" "cn")
|
||||||
(install-opentype-fonts "SubsetOTF/JP" "jp")
|
(install-opentype-fonts "SubsetOTF/JP" "jp")
|
||||||
(install-opentype-fonts "SubsetOTF/KR" "kr")
|
(install-opentype-fonts "SubsetOTF/KR" "kr")
|
||||||
(install-opentype-fonts "SubsetOTF/TW" "tw")))))
|
(install-opentype-fonts "SubsetOTF/TW" "tw")
|
||||||
|
(for-each delete-file (find-files %output "\\.zip$"))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("gzip" ,gzip)
|
`(("gzip" ,gzip)
|
||||||
("tar" ,tar)))
|
("tar" ,tar)))
|
||||||
|
|
@ -439,7 +440,7 @@ And in several OpenType/CFF-based deployment configurations to accommodate
|
||||||
various system requirements or limitations. As the name suggests, Pan-CJK
|
various system requirements or limitations. As the name suggests, Pan-CJK
|
||||||
fonts are intended to support the characters necessary to render or display
|
fonts are intended to support the characters necessary to render or display
|
||||||
text in Simplified Chinese, Traditional Chinese, Japanese, and Korean.")
|
text in Simplified Chinese, Traditional Chinese, Japanese, and Korean.")
|
||||||
(license license:asl2.0)))
|
(license license:silofl1.1)))
|
||||||
|
|
||||||
(define-public font-wqy-zenhei
|
(define-public font-wqy-zenhei
|
||||||
(package
|
(package
|
||||||
|
|
|
||||||
|
|
@ -203,7 +203,7 @@ applications should be.")
|
||||||
(define-public graphite2
|
(define-public graphite2
|
||||||
(package
|
(package
|
||||||
(name "graphite2")
|
(name "graphite2")
|
||||||
(version "1.3.1")
|
(version "1.3.3")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -212,7 +212,7 @@ applications should be.")
|
||||||
version ".tgz"))
|
version ".tgz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0xvhmlyyxg2qmbwyl8k2f9w7mrbjyl59823pnjd8xmxpyl6976d5"))))
|
"1n22vvi4jl83m4sqhvd7v31bhyhyd8j6c3yjgh4zjfyrvid16jrg"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("python" ,python-2) ; because of "import imap" in tests
|
`(("python" ,python-2) ; because of "import imap" in tests
|
||||||
|
|
|
||||||
|
|
@ -157,7 +157,10 @@ the freedesktop.org XDG Base Directory specification.")
|
||||||
(assoc-ref %build-inputs "libcap"))
|
(assoc-ref %build-inputs "libcap"))
|
||||||
(string-append "--with-udevrulesdir="
|
(string-append "--with-udevrulesdir="
|
||||||
(assoc-ref %outputs "out")
|
(assoc-ref %outputs "out")
|
||||||
"/lib/udev/rules.d"))
|
"/lib/udev/rules.d")
|
||||||
|
;; XXX: fail with:
|
||||||
|
;; src/shared/clean-ipc.c:315: undefined reference to `mq_unlink'
|
||||||
|
"LDFLAGS=-lrt")
|
||||||
#:make-flags '("PKTTYAGENT=/run/current-system/profile/bin/pkttyagent")))
|
#:make-flags '("PKTTYAGENT=/run/current-system/profile/bin/pkttyagent")))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("intltool" ,intltool)
|
`(("intltool" ,intltool)
|
||||||
|
|
@ -236,14 +239,14 @@ Python.")
|
||||||
(define-public wayland
|
(define-public wayland
|
||||||
(package
|
(package
|
||||||
(name "wayland")
|
(name "wayland")
|
||||||
(version "1.8.1")
|
(version "1.9.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://wayland.freedesktop.org/releases/"
|
(uri (string-append "http://wayland.freedesktop.org/releases/"
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1j3gfzn8i0xhk3j34mwb2srrscjxfyi279jhyq80mz943j6r6z7i"))))
|
"1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("doxygen" ,doxygen)
|
`(("doxygen" ,doxygen)
|
||||||
|
|
@ -340,12 +343,19 @@ Analysis and Reporting Technology) functionality.")
|
||||||
`(("acl" ,acl)
|
`(("acl" ,acl)
|
||||||
("libatasmart" ,libatasmart)
|
("libatasmart" ,libatasmart)
|
||||||
("libgudev" ,libgudev)
|
("libgudev" ,libgudev)
|
||||||
("polkit" ,polkit)))
|
("polkit" ,polkit)
|
||||||
|
("util-linux" ,util-linux)))
|
||||||
|
(outputs '("out"
|
||||||
|
"doc")) ;5 MiB of gtk-doc HTML
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; requiring system message dbus
|
`(#:tests? #f ; requiring system message dbus
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
(list "--disable-man"
|
(list "--disable-man"
|
||||||
"--localstatedir=/var"
|
"--localstatedir=/var"
|
||||||
|
"--enable-fhs-media" ;mount devices in /media, not /run/media
|
||||||
|
(string-append "--with-html-dir="
|
||||||
|
(assoc-ref %outputs "doc")
|
||||||
|
"/share/doc/udisks/html")
|
||||||
(string-append "--with-udevdir=" %output "/lib/udev"))
|
(string-append "--with-udevdir=" %output "/lib/udev"))
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
|
|
@ -357,7 +367,18 @@ Analysis and Reporting Technology) functionality.")
|
||||||
(("girdir = .*")
|
(("girdir = .*")
|
||||||
"girdir = $(datadir)/gir-1.0\n")
|
"girdir = $(datadir)/gir-1.0\n")
|
||||||
(("typelibsdir = .*")
|
(("typelibsdir = .*")
|
||||||
"typelibsdir = $(libdir)/girepository-1.0\n")))))))
|
"typelibsdir = $(libdir)/girepository-1.0\n"))))
|
||||||
|
(add-after 'install 'set-mount-file-name
|
||||||
|
(lambda* (#:key outputs inputs #:allow-other-keys)
|
||||||
|
;; Tell 'udisksd' where to find the 'mount' command.
|
||||||
|
(let ((out (assoc-ref outputs "out"))
|
||||||
|
(utils (assoc-ref inputs "util-linux")))
|
||||||
|
(wrap-program (string-append out "/libexec/udisks2/udisksd")
|
||||||
|
`("PATH" ":" prefix
|
||||||
|
(,(string-append utils "/bin") ;for 'mount'
|
||||||
|
"/run/current-system/profile/bin"
|
||||||
|
"/run/current-system/profile/sbin")))
|
||||||
|
#t))))))
|
||||||
(home-page "http://www.freedesktop.org/wiki/Software/udisks/")
|
(home-page "http://www.freedesktop.org/wiki/Software/udisks/")
|
||||||
(synopsis "Disk manager service")
|
(synopsis "Disk manager service")
|
||||||
(description
|
(description
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
|
||||||
|
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -27,14 +28,14 @@
|
||||||
(define-public freeipmi
|
(define-public freeipmi
|
||||||
(package
|
(package
|
||||||
(name "freeipmi")
|
(name "freeipmi")
|
||||||
(version "1.4.10")
|
(version "1.5.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnu/freeipmi/freeipmi-"
|
(uri (string-append "mirror://gnu/freeipmi/freeipmi-"
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1l98l8g8lha85q1d288wr7dyx00x36smh9g5wza15n4wm35c9wqs"))))
|
"0lhjxlha4j5rx11d81y1rgp9j18rlpxsjc0flsmj6bm60awmm627"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("readline" ,readline) ("libgcrypt" ,libgcrypt)))
|
`(("readline" ,readline) ("libgcrypt" ,libgcrypt)))
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,9 @@
|
||||||
#:use-module (gnu packages gtk)
|
#:use-module (gnu packages gtk)
|
||||||
#:use-module (gnu packages sdl)
|
#:use-module (gnu packages sdl)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages xiph))
|
#:use-module (gnu packages xiph)
|
||||||
|
#:use-module (gnu packages lua)
|
||||||
|
#:use-module (gnu packages mp3))
|
||||||
|
|
||||||
(define-public bullet
|
(define-public bullet
|
||||||
(package
|
(package
|
||||||
|
|
@ -260,3 +262,35 @@ files can be accessed in the same way as you access files directly on a disk,
|
||||||
and it makes it easy to ship a new archive that will override a previous
|
and it makes it easy to ship a new archive that will override a previous
|
||||||
archive on a per-file basis.")
|
archive on a per-file basis.")
|
||||||
(license license:zlib)))
|
(license license:zlib)))
|
||||||
|
|
||||||
|
(define-public love
|
||||||
|
(package
|
||||||
|
(name "love")
|
||||||
|
(version "0.9.2")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "https://bitbucket.org/rude/love/downloads/"
|
||||||
|
"love-" version "-linux-src.tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0wn1npr5gal5b1idh4a5fwc3f5c36lsbjd4r4d699rqlviid15d9"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
(inputs
|
||||||
|
`(("devil" ,devil)
|
||||||
|
("freetype" ,freetype)
|
||||||
|
("libmodplug" ,libmodplug)
|
||||||
|
("libvorbis" ,libvorbis)
|
||||||
|
("luajit" ,luajit)
|
||||||
|
("mesa" ,mesa)
|
||||||
|
("mpg123" ,mpg123)
|
||||||
|
("openal" ,openal)
|
||||||
|
("physfs" ,physfs)
|
||||||
|
("sdl2" ,sdl2)
|
||||||
|
("zlib" ,zlib)))
|
||||||
|
(synopsis "2D game framework for Lua")
|
||||||
|
(description "LÖVE is a framework for making 2D games in the Lua
|
||||||
|
programming language.")
|
||||||
|
(home-page "https://love2d.org/")
|
||||||
|
(license license:zlib)))
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,19 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013 John Darrington <jmd@gnu.org>
|
;;; Copyright © 2013 John Darrington <jmd@gnu.org>
|
||||||
;;; Copyright © 2014 David Thompson <dthompson2@worcester.edu>
|
;;; Copyright © 2014, 2015 David Thompson <dthompson2@worcester.edu>
|
||||||
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
|
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
|
||||||
;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com>
|
;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com>
|
||||||
;;; Copyright © 2014 Sylvain Beucler <beuc@beuc.net>
|
;;; Copyright © 2014 Sylvain Beucler <beuc@beuc.net>
|
||||||
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2014, 2015 Sou Bunnbu <iyzsong@gmail.com>
|
;;; Copyright © 2014, 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
|
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
|
||||||
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
|
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
|
||||||
;;; Copyright © 2015 Christopher Allan Webber <cwebber@dustycloud.org>
|
;;; Copyright © 2015 Christopher Allan Webber <cwebber@dustycloud.org>
|
||||||
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
|
;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
|
||||||
|
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||||
|
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -34,7 +36,11 @@
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix git-download)
|
#:use-module (guix git-download)
|
||||||
|
#:use-module (guix svn-download)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
|
#:use-module (gnu packages algebra)
|
||||||
|
#:use-module (gnu packages autotools)
|
||||||
|
#:use-module (gnu packages backup)
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages admin)
|
#:use-module (gnu packages admin)
|
||||||
#:use-module (gnu packages audio)
|
#:use-module (gnu packages audio)
|
||||||
|
|
@ -49,6 +55,7 @@
|
||||||
#:use-module (gnu packages guile)
|
#:use-module (gnu packages guile)
|
||||||
#:use-module (gnu packages libcanberra)
|
#:use-module (gnu packages libcanberra)
|
||||||
#:use-module (gnu packages libunwind)
|
#:use-module (gnu packages libunwind)
|
||||||
|
#:use-module (gnu packages haskell)
|
||||||
#:use-module (gnu packages mp3)
|
#:use-module (gnu packages mp3)
|
||||||
#:use-module (gnu packages image)
|
#:use-module (gnu packages image)
|
||||||
#:use-module (gnu packages ncurses)
|
#:use-module (gnu packages ncurses)
|
||||||
|
|
@ -78,6 +85,7 @@
|
||||||
#:use-module (gnu packages fribidi)
|
#:use-module (gnu packages fribidi)
|
||||||
#:use-module (guix build-system trivial)
|
#:use-module (guix build-system trivial)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (guix build-system haskell)
|
||||||
#:use-module (guix build-system cmake)
|
#:use-module (guix build-system cmake)
|
||||||
#:use-module (guix build-system trivial))
|
#:use-module (guix build-system trivial))
|
||||||
|
|
||||||
|
|
@ -151,8 +159,8 @@ scriptable with Guile.")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://abbaye-for-linux.googlecode.com/files/abbaye-for-linux-src-"
|
(uri (string-append "http://abbaye-for-linux.googlecode.com/files/"
|
||||||
version ".tar.gz"))
|
"abbaye-for-linux-src-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1wgvckgqa2084rbskxif58wbb83xbas8s1i8s7d57xbj08ryq8rk"))))
|
"1wgvckgqa2084rbskxif58wbb83xbas8s1i8s7d57xbj08ryq8rk"))))
|
||||||
|
|
@ -1048,6 +1056,48 @@ experience and advance levels, and are carried over from one scenario to the
|
||||||
next campaign.")
|
next campaign.")
|
||||||
(license license:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public dosbox
|
||||||
|
(package
|
||||||
|
(name "dosbox")
|
||||||
|
(version "0.74.svn3947")
|
||||||
|
(source (origin
|
||||||
|
(method svn-fetch)
|
||||||
|
(uri (svn-reference
|
||||||
|
(url "http://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk/")
|
||||||
|
(revision 3947)))
|
||||||
|
(file-name (string-append name "-" version "-checkout"))
|
||||||
|
;; Use SVN head, since the last release (2010) is incompatible
|
||||||
|
;; with GCC 4.8+ (see
|
||||||
|
;; <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624976>).
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1p918j6090d1nkvgq7ifvmn506zrdmyi32y7p3ms40d5ssqjg8fj"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
`(#:phases (modify-phases %standard-phases
|
||||||
|
(add-after
|
||||||
|
'unpack 'autogen.sh
|
||||||
|
(lambda _
|
||||||
|
(zero? (system* "sh" "autogen.sh")))))))
|
||||||
|
(native-inputs
|
||||||
|
`(("autoconf" ,autoconf)
|
||||||
|
("automake" ,automake)))
|
||||||
|
(inputs
|
||||||
|
`(("sdl" ,sdl)
|
||||||
|
("libpng" ,libpng)
|
||||||
|
("zlib" ,zlib)
|
||||||
|
("alsa-lib" ,alsa-lib)
|
||||||
|
("glu" ,glu)
|
||||||
|
("mesa" ,mesa)))
|
||||||
|
(home-page "http://www.dosbox.com")
|
||||||
|
(synopsis "X86 emulator with CGA/EGA/VGA/etc. graphics and sound")
|
||||||
|
(description "DOSBox is a DOS-emulator that uses the SDL library. DOSBox
|
||||||
|
also emulates CPU:286/386 realmode/protected mode, Directory
|
||||||
|
FileSystem/XMS/EMS, Tandy/Hercules/CGA/EGA/VGA/VESA graphics, a
|
||||||
|
SoundBlaster/Gravis Ultra Sound card for excellent sound compatibility with
|
||||||
|
older games.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
(define-public gamine
|
(define-public gamine
|
||||||
(package
|
(package
|
||||||
(name "gamine")
|
(name "gamine")
|
||||||
|
|
@ -1094,10 +1144,43 @@ on the screen and keyboard to display letters.")
|
||||||
;; Most files under gpl2+ or gpl3+, but eat.wav under gpl3
|
;; Most files under gpl2+ or gpl3+, but eat.wav under gpl3
|
||||||
(license license:gpl3)))
|
(license license:gpl3)))
|
||||||
|
|
||||||
|
(define-public raincat
|
||||||
|
(package
|
||||||
|
(name "raincat")
|
||||||
|
(version "1.1.1.3")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"http://hackage.haskell.org/package/Raincat/Raincat-"
|
||||||
|
version
|
||||||
|
".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1aalh68h6799mv4vyg30zpskl5jkn6x2j1jza7p4lrflyifxzar8"))))
|
||||||
|
(build-system haskell-build-system)
|
||||||
|
(inputs
|
||||||
|
`(("ghc-extensible-exceptions" ,ghc-extensible-exceptions)
|
||||||
|
("ghc-mtl" ,ghc-mtl)
|
||||||
|
("ghc-random" ,ghc-random)
|
||||||
|
("ghc-glut" ,ghc-glut)
|
||||||
|
("ghc-opengl" ,ghc-opengl)
|
||||||
|
("ghc-sdl" ,ghc-sdl)
|
||||||
|
("ghc-sdl-image" ,ghc-sdl-image)
|
||||||
|
("ghc-sdl-mixer" ,ghc-sdl-mixer)))
|
||||||
|
(home-page "http://raincat.bysusanlin.com/")
|
||||||
|
(synopsis "Puzzle game with a cat in lead role")
|
||||||
|
(description "Project Raincat is a game developed by Carnegie Mellon
|
||||||
|
students through GCS during the Fall 2008 semester. Raincat features game
|
||||||
|
play inspired from classics Lemmings and The Incredible Machine. The project
|
||||||
|
proved to be an excellent learning experience for the programmers. Everything
|
||||||
|
is programmed in Haskell.")
|
||||||
|
(license license:bsd-3)))
|
||||||
|
|
||||||
(define-public manaplus
|
(define-public manaplus
|
||||||
(package
|
(package
|
||||||
(name "manaplus")
|
(name "manaplus")
|
||||||
(version "1.5.9.26")
|
(version "1.5.12.5")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -1105,7 +1188,7 @@ on the screen and keyboard to display letters.")
|
||||||
version "/manaplus-" version ".tar.xz"))
|
version "/manaplus-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"070ms1cv7q88284pqh66lfhacckgv7m9s8z9009k2laypibx7vs6"))))
|
"0kmd743q40v82221wj8b09n30lqiwl7096v3m7ki3ynsgszkm326"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:configure-flags
|
'(#:configure-flags
|
||||||
|
|
@ -1132,3 +1215,641 @@ world}, @uref{http://evolonline.org, Evol Online} and
|
||||||
;; "data/themes/{golden-delicious,jewelry}/*" are under CC-BY-SA.
|
;; "data/themes/{golden-delicious,jewelry}/*" are under CC-BY-SA.
|
||||||
;; The rest is under GPL2+.
|
;; The rest is under GPL2+.
|
||||||
(license (list license:gpl2+ license:zlib license:cc-by-sa4.0))))
|
(license (list license:gpl2+ license:zlib license:cc-by-sa4.0))))
|
||||||
|
|
||||||
|
(define-public mupen64plus-core
|
||||||
|
(package
|
||||||
|
(name "mupen64plus-core")
|
||||||
|
(version "2.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/mupen64plus/mupen64plus-core/archive/"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32 "0dg2hksm5qni2hcha93k7n4fqr92888p946f7phb0ndschzfh9kk"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)
|
||||||
|
("which" ,which)))
|
||||||
|
(inputs
|
||||||
|
`(("freetype" ,freetype)
|
||||||
|
("glu" ,glu)
|
||||||
|
("libpng" ,libpng)
|
||||||
|
("mesa" ,mesa)
|
||||||
|
("sdl2" ,sdl2)
|
||||||
|
("zlib" ,zlib)))
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
;; The mupen64plus build system has no configure phase.
|
||||||
|
(delete 'configure)
|
||||||
|
;; Makefile is in a subdirectory.
|
||||||
|
(add-before
|
||||||
|
'build 'cd-to-project-dir
|
||||||
|
(lambda _
|
||||||
|
(chdir "projects/unix"))))
|
||||||
|
#:make-flags (let ((out (assoc-ref %outputs "out")))
|
||||||
|
(list "all" (string-append "PREFIX=" out)))
|
||||||
|
;; There are no tests.
|
||||||
|
#:tests? #f))
|
||||||
|
;; As per the Makefile (in projects/unix/Makefile):
|
||||||
|
(supported-systems '("i686-linux" "x86_64-linux"))
|
||||||
|
(home-page "http://www.mupen64plus.org/")
|
||||||
|
(synopsis "Nintendo 64 emulator core library")
|
||||||
|
(description
|
||||||
|
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
|
||||||
|
which is capable of accurately playing many games. This package contains the
|
||||||
|
core library.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public mupen64plus-audio-sdl
|
||||||
|
(package
|
||||||
|
(name "mupen64plus-audio-sdl")
|
||||||
|
(version "2.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/mupen64plus/mupen64plus-audio-sdl/archive/"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32 "0ss6w92n2rpfnazhg9lbq0nvs3fqx93nliz3k3wjxdlx4dpi7h3a"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)
|
||||||
|
("which" ,which)))
|
||||||
|
(inputs
|
||||||
|
`(("mupen64plus-core" ,mupen64plus-core)
|
||||||
|
("sdl2" ,sdl2)))
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
;; The mupen64plus build system has no configure phase.
|
||||||
|
(delete 'configure)
|
||||||
|
;; Makefile is in a subdirectory.
|
||||||
|
(add-before
|
||||||
|
'build 'cd-to-project-dir
|
||||||
|
(lambda _
|
||||||
|
(chdir "projects/unix"))))
|
||||||
|
#:make-flags
|
||||||
|
(let ((out (assoc-ref %outputs "out"))
|
||||||
|
(m64p (assoc-ref %build-inputs "mupen64plus-core")))
|
||||||
|
(list "all"
|
||||||
|
(string-append "PREFIX=" out)
|
||||||
|
(string-append "APIDIR=" m64p "/include/mupen64plus")))
|
||||||
|
;; There are no tests.
|
||||||
|
#:tests? #f))
|
||||||
|
(home-page "http://www.mupen64plus.org/")
|
||||||
|
(synopsis "Mupen64Plus SDL input plugin")
|
||||||
|
(description
|
||||||
|
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
|
||||||
|
which is capable of accurately playing many games. This package contains the
|
||||||
|
SDL audio plugin.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public mupen64plus-input-sdl
|
||||||
|
(package
|
||||||
|
(name "mupen64plus-input-sdl")
|
||||||
|
(version "2.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/mupen64plus/mupen64plus-input-sdl/archive/"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32 "11sj5dbalp2nrlmki34vy7wy28vc175pnnkdk65p8599hnyq37ri"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(native-inputs
|
||||||
|
`(("which" ,which)))
|
||||||
|
(inputs
|
||||||
|
`(("mupen64plus-core" ,mupen64plus-core)
|
||||||
|
("sdl2" ,sdl2)))
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
;; The mupen64plus build system has no configure phase.
|
||||||
|
(delete 'configure)
|
||||||
|
;; Makefile is in a subdirectory.
|
||||||
|
(add-before
|
||||||
|
'build 'cd-to-project-dir
|
||||||
|
(lambda _
|
||||||
|
(chdir "projects/unix"))))
|
||||||
|
#:make-flags
|
||||||
|
(let ((out (assoc-ref %outputs "out"))
|
||||||
|
(m64p (assoc-ref %build-inputs "mupen64plus-core")))
|
||||||
|
(list "all"
|
||||||
|
(string-append "PREFIX=" out)
|
||||||
|
(string-append "APIDIR=" m64p "/include/mupen64plus")))
|
||||||
|
;; There are no tests.
|
||||||
|
#:tests? #f))
|
||||||
|
(home-page "http://www.mupen64plus.org/")
|
||||||
|
(synopsis "Mupen64Plus SDL input plugin")
|
||||||
|
(description
|
||||||
|
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
|
||||||
|
which is capable of accurately playing many games. This package contains the
|
||||||
|
SDL input plugin.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public mupen64plus-rsp-hle
|
||||||
|
(package
|
||||||
|
(name "mupen64plus-rsp-hle")
|
||||||
|
(version "2.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/mupen64plus/mupen64plus-rsp-hle/archive/"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32 "15h7mgz6xd2zjzm6l3f96sbs8kwr3xvbwzgikhnka79m6c69hsxv"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(inputs
|
||||||
|
`(("mupen64plus-core" ,mupen64plus-core)))
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
;; The mupen64plus build system has no configure phase.
|
||||||
|
(delete 'configure)
|
||||||
|
;; Makefile is in a subdirectory.
|
||||||
|
(add-before
|
||||||
|
'build 'cd-to-project-dir
|
||||||
|
(lambda _
|
||||||
|
(chdir "projects/unix"))))
|
||||||
|
#:make-flags
|
||||||
|
(let ((out (assoc-ref %outputs "out"))
|
||||||
|
(m64p (assoc-ref %build-inputs "mupen64plus-core")))
|
||||||
|
(list "all"
|
||||||
|
(string-append "PREFIX=" out)
|
||||||
|
(string-append "APIDIR=" m64p "/include/mupen64plus")))
|
||||||
|
;; There are no tests.
|
||||||
|
#:tests? #f))
|
||||||
|
(home-page "http://www.mupen64plus.org/")
|
||||||
|
(synopsis "Mupen64Plus SDL input plugin")
|
||||||
|
(description
|
||||||
|
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
|
||||||
|
which is capable of accurately playing many games. This package contains the
|
||||||
|
high-level emulation (HLE) RSP processor plugin.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public mupen64plus-rsp-z64
|
||||||
|
(package
|
||||||
|
(name "mupen64plus-rsp-z64")
|
||||||
|
(version "2.0.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/mupen64plus/mupen64plus-rsp-z64/archive/"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32 "10jz1w2dhx5slhyk4m8mdqlpsd6cshchslr1fckb2ayzb1ls3ghi"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(inputs
|
||||||
|
`(("mupen64plus-core" ,mupen64plus-core)))
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
;; The mupen64plus build system has no configure phase.
|
||||||
|
(delete 'configure)
|
||||||
|
;; Makefile is in a subdirectory.
|
||||||
|
(add-before
|
||||||
|
'build 'cd-to-project-dir
|
||||||
|
(lambda _
|
||||||
|
(chdir "projects/unix"))))
|
||||||
|
#:make-flags
|
||||||
|
(let ((out (assoc-ref %outputs "out"))
|
||||||
|
(m64p (assoc-ref %build-inputs "mupen64plus-core")))
|
||||||
|
(list "all"
|
||||||
|
(string-append "PREFIX=" out)
|
||||||
|
(string-append "APIDIR=" m64p "/include/mupen64plus")))
|
||||||
|
;; There are no tests.
|
||||||
|
#:tests? #f))
|
||||||
|
(home-page "http://www.mupen64plus.org/")
|
||||||
|
(synopsis "Mupen64Plus SDL input plugin")
|
||||||
|
(description
|
||||||
|
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
|
||||||
|
which is capable of accurately playing many games. This package contains the
|
||||||
|
Z64 RSP processor plugin.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public mupen64plus-video-arachnoid
|
||||||
|
(package
|
||||||
|
(name "mupen64plus-video-arachnoid")
|
||||||
|
(version "2.0.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/mupen64plus/mupen64plus-video-arachnoid/archive/"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32 "0jjwf144rihznm4lnqbhgigxw664v3v32wy94adaa6imk8z6gslh"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)
|
||||||
|
("which" ,which)))
|
||||||
|
(inputs
|
||||||
|
`(("mesa" ,mesa)
|
||||||
|
("mupen64plus-core" ,mupen64plus-core)))
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
;; The mupen64plus build system has no configure phase.
|
||||||
|
(delete 'configure)
|
||||||
|
;; Makefile is in a subdirectory.
|
||||||
|
(add-before
|
||||||
|
'build 'cd-to-project-dir
|
||||||
|
(lambda _
|
||||||
|
(chdir "projects/unix"))))
|
||||||
|
#:make-flags
|
||||||
|
(let ((out (assoc-ref %outputs "out"))
|
||||||
|
(m64p (assoc-ref %build-inputs "mupen64plus-core")))
|
||||||
|
(list "all"
|
||||||
|
(string-append "PREFIX=" out)
|
||||||
|
(string-append "APIDIR=" m64p "/include/mupen64plus")))
|
||||||
|
;; There are no tests.
|
||||||
|
#:tests? #f))
|
||||||
|
(home-page "http://www.mupen64plus.org/")
|
||||||
|
(synopsis "Mupen64Plus Rice Video plugin")
|
||||||
|
(description
|
||||||
|
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
|
||||||
|
which is capable of accurately playing many games. This package contains the
|
||||||
|
Arachnoid video plugin.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public mupen64plus-video-glide64
|
||||||
|
(package
|
||||||
|
(name "mupen64plus-video-glide64")
|
||||||
|
(version "2.0.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/mupen64plus/mupen64plus-video-glide64/archive/"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32 "1rm55dbf6xgsq1blbzs6swa2ajv0qkn38acbljj346abnk6s3dla"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)
|
||||||
|
("which" ,which)))
|
||||||
|
(inputs
|
||||||
|
`(("mesa" ,mesa)
|
||||||
|
("mupen64plus-core" ,mupen64plus-core)
|
||||||
|
("sdl2" ,sdl2)))
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
;; The mupen64plus build system has no configure phase.
|
||||||
|
(delete 'configure)
|
||||||
|
;; Makefile is in a subdirectory.
|
||||||
|
(add-before
|
||||||
|
'build 'cd-to-project-dir
|
||||||
|
(lambda _
|
||||||
|
(chdir "projects/unix")))
|
||||||
|
;; XXX Should be unnecessary with the next release.
|
||||||
|
(add-before
|
||||||
|
'build 'use-sdl2
|
||||||
|
(lambda _
|
||||||
|
(substitute* "Makefile"
|
||||||
|
(("SDL_CONFIG = (.*)sdl-config" all prefix)
|
||||||
|
(string-append "SDL_CONFIG = " prefix "sdl2-config"))))))
|
||||||
|
#:make-flags
|
||||||
|
(let ((out (assoc-ref %outputs "out"))
|
||||||
|
(m64p (assoc-ref %build-inputs "mupen64plus-core")))
|
||||||
|
(list "all"
|
||||||
|
(string-append "PREFIX=" out)
|
||||||
|
(string-append "APIDIR=" m64p "/include/mupen64plus")))
|
||||||
|
;; There are no tests.
|
||||||
|
#:tests? #f))
|
||||||
|
(home-page "http://www.mupen64plus.org/")
|
||||||
|
(synopsis "Mupen64Plus Rice Video plugin")
|
||||||
|
(description
|
||||||
|
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
|
||||||
|
which is capable of accurately playing many games. This package contains the
|
||||||
|
Glide64 video plugin.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public mupen64plus-video-glide64mk2
|
||||||
|
(package
|
||||||
|
(name "mupen64plus-video-glide64mk2")
|
||||||
|
(version "2.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/mupen64plus/mupen64plus-video-glide64mk2/archive/"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32 "1ihl4q293d6svba26b4mhapjcdg12p90gibz79b4mx423jlcxxj9"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)
|
||||||
|
("which" ,which)))
|
||||||
|
(inputs
|
||||||
|
`(("boost" ,boost)
|
||||||
|
("libpng" ,libpng)
|
||||||
|
("mesa" ,mesa)
|
||||||
|
("mupen64plus-core" ,mupen64plus-core)
|
||||||
|
("sdl2" ,sdl2)
|
||||||
|
("zlib" ,zlib)))
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
;; The mupen64plus build system has no configure phase.
|
||||||
|
(delete 'configure)
|
||||||
|
;; Makefile is in a subdirectory.
|
||||||
|
(add-before
|
||||||
|
'build 'cd-to-project-dir
|
||||||
|
(lambda _
|
||||||
|
(chdir "projects/unix"))))
|
||||||
|
#:make-flags
|
||||||
|
(let ((out (assoc-ref %outputs "out"))
|
||||||
|
(m64p (assoc-ref %build-inputs "mupen64plus-core")))
|
||||||
|
(list "all"
|
||||||
|
(string-append "PREFIX=" out)
|
||||||
|
(string-append "APIDIR=" m64p "/include/mupen64plus")))
|
||||||
|
;; There are no tests.
|
||||||
|
#:tests? #f))
|
||||||
|
(home-page "http://www.mupen64plus.org/")
|
||||||
|
(synopsis "Mupen64Plus Rice Video plugin")
|
||||||
|
(description
|
||||||
|
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
|
||||||
|
which is capable of accurately playing many games. This package contains the
|
||||||
|
Glide64MK2 video plugin.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public mupen64plus-video-rice
|
||||||
|
(package
|
||||||
|
(name "mupen64plus-video-rice")
|
||||||
|
(version "2.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/mupen64plus/mupen64plus-video-rice/archive/"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32 "0rd2scjmh285w61aj3mgx71whg5rqrjbry3cdgicczrnyvf8wdvk"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)
|
||||||
|
("which" ,which)))
|
||||||
|
(inputs
|
||||||
|
`(("libpng" ,libpng)
|
||||||
|
("mesa" ,mesa)
|
||||||
|
("mupen64plus-core" ,mupen64plus-core)
|
||||||
|
("sdl2" ,sdl2)))
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
;; The mupen64plus build system has no configure phase.
|
||||||
|
(delete 'configure)
|
||||||
|
;; Makefile is in a subdirectory.
|
||||||
|
(add-before
|
||||||
|
'build 'cd-to-project-dir
|
||||||
|
(lambda _
|
||||||
|
(chdir "projects/unix"))))
|
||||||
|
#:make-flags
|
||||||
|
(let ((out (assoc-ref %outputs "out"))
|
||||||
|
(m64p (assoc-ref %build-inputs "mupen64plus-core")))
|
||||||
|
(list "all"
|
||||||
|
(string-append "PREFIX=" out)
|
||||||
|
(string-append "APIDIR=" m64p "/include/mupen64plus")))
|
||||||
|
;; There are no tests.
|
||||||
|
#:tests? #f))
|
||||||
|
(home-page "http://www.mupen64plus.org/")
|
||||||
|
(synopsis "Mupen64Plus Rice Video plugin")
|
||||||
|
(description
|
||||||
|
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
|
||||||
|
which is capable of accurately playing many games. This package contains the
|
||||||
|
Rice Video plugin.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public mupen64plus-video-z64
|
||||||
|
(package
|
||||||
|
(name "mupen64plus-video-z64")
|
||||||
|
(version "2.0.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/mupen64plus/mupen64plus-video-z64/archive/"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32 "1x7wsjs5gx2iwx20p4cjcbf696zsjlh31qxmghwv0ifrq8x58s1b"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)
|
||||||
|
("which" ,which)))
|
||||||
|
(inputs
|
||||||
|
`(("glew" ,glew)
|
||||||
|
("mupen64plus-core" ,mupen64plus-core)
|
||||||
|
("sdl2" ,sdl2)))
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
;; The mupen64plus build system has no configure phase.
|
||||||
|
(delete 'configure)
|
||||||
|
;; Makefile is in a subdirectory.
|
||||||
|
(add-before
|
||||||
|
'build 'cd-to-project-dir
|
||||||
|
(lambda _
|
||||||
|
(chdir "projects/unix")))
|
||||||
|
;; XXX Should be unnecessary with the next release.
|
||||||
|
(add-before
|
||||||
|
'build 'use-sdl2
|
||||||
|
(lambda _
|
||||||
|
(substitute* "Makefile"
|
||||||
|
(("SDL_CONFIG = (.*)sdl-config" all prefix)
|
||||||
|
(string-append "SDL_CONFIG = " prefix "sdl2-config"))))))
|
||||||
|
#:make-flags
|
||||||
|
(let ((out (assoc-ref %outputs "out"))
|
||||||
|
(m64p (assoc-ref %build-inputs "mupen64plus-core")))
|
||||||
|
(list "all"
|
||||||
|
(string-append "PREFIX=" out)
|
||||||
|
(string-append "APIDIR=" m64p "/include/mupen64plus")))
|
||||||
|
;; There are no tests.
|
||||||
|
#:tests? #f))
|
||||||
|
(home-page "http://www.mupen64plus.org/")
|
||||||
|
(synopsis "Mupen64Plus Z64 video plugin")
|
||||||
|
(description
|
||||||
|
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
|
||||||
|
which is capable of accurately playing many games. This package contains the
|
||||||
|
Z64 video plugin.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public mupen64plus-ui-console
|
||||||
|
(package
|
||||||
|
(name "mupen64plus-ui-console")
|
||||||
|
(version "2.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/mupen64plus/mupen64plus-ui-console/archive/"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32 "04qkpd8ic7xsgnqz7spl00wxdygf79m7d1k8rabbygjk5lg6p8z2"))
|
||||||
|
(patches
|
||||||
|
(list (search-patch "mupen64plus-ui-console-notice.patch")))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)
|
||||||
|
("which" ,which)))
|
||||||
|
(inputs
|
||||||
|
`(("sdl2" ,sdl2)))
|
||||||
|
;; Mupen64Plus supports a single data directory and a single plugin
|
||||||
|
;; directory in its configuration, yet we need data and plugin files from
|
||||||
|
;; a variety of packages. The best way to deal with this is to install
|
||||||
|
;; all packages from which data and plugin files are needed into one's
|
||||||
|
;; profile, and point the configuration there. Hence, propagate the most
|
||||||
|
;; important packages here to save the user from the bother. The patch
|
||||||
|
;; mupen64plus-ui-console-notice also gives users instructions on what
|
||||||
|
;; they need to do in order to point the configuration to their profile.
|
||||||
|
(propagated-inputs
|
||||||
|
`(("mupen64plus-core" ,mupen64plus-core)
|
||||||
|
("mupen64plus-audio-sdl" ,mupen64plus-audio-sdl)
|
||||||
|
("mupen64plus-input-sdl" ,mupen64plus-input-sdl)
|
||||||
|
("mupen64plus-rsp-hle" ,mupen64plus-rsp-hle)
|
||||||
|
("mupen64plus-video-glide64" ,mupen64plus-video-glide64)
|
||||||
|
("mupen64plus-video-glide64mk2" ,mupen64plus-video-glide64mk2)
|
||||||
|
("mupen64plus-video-rice" ,mupen64plus-video-rice)))
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
;; The mupen64plus build system has no configure phase.
|
||||||
|
(delete 'configure)
|
||||||
|
;; Makefile is in a subdirectory.
|
||||||
|
(add-before
|
||||||
|
'build 'cd-to-project-dir
|
||||||
|
(lambda _
|
||||||
|
(chdir "projects/unix"))))
|
||||||
|
#:make-flags
|
||||||
|
(let ((out (assoc-ref %outputs "out"))
|
||||||
|
(m64p (assoc-ref %build-inputs "mupen64plus-core")))
|
||||||
|
(list "all"
|
||||||
|
(string-append "PREFIX=" out)
|
||||||
|
(string-append "APIDIR=" m64p "/include/mupen64plus")
|
||||||
|
;; Trailing slash matters here.
|
||||||
|
(string-append "COREDIR=" m64p "/lib/")))
|
||||||
|
;; There are no tests.
|
||||||
|
#:tests? #f))
|
||||||
|
(home-page "http://www.mupen64plus.org/")
|
||||||
|
(synopsis "Mupen64Plus SDL input plugin")
|
||||||
|
(description
|
||||||
|
"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator
|
||||||
|
which is capable of accurately playing many games. This package contains the
|
||||||
|
command line user interface. Installing this package is the easiest way
|
||||||
|
towards a working Mupen64Plus for casual users.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public nestopia-ue
|
||||||
|
(package
|
||||||
|
(name "nestopia-ue")
|
||||||
|
(version "1.46.2")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/rdanbrook/nestopia/archive/"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"07h49xwvg61dx20rk5p4r3ax2ar5y0ppvm60cqwqljyi9rdfbh7p"))
|
||||||
|
(modules '((guix build utils)))
|
||||||
|
(snippet
|
||||||
|
'(begin
|
||||||
|
;; We don't need libretro for the GNU/Linux build.
|
||||||
|
(delete-file-recursively "libretro")
|
||||||
|
;; Use system zlib.
|
||||||
|
(delete-file-recursively "source/zlib")
|
||||||
|
(substitute* "source/core/NstZlib.cpp"
|
||||||
|
(("#include \"../zlib/zlib.h\"") "#include <zlib.h>"))))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
(inputs
|
||||||
|
`(("ao" ,ao)
|
||||||
|
("glu" ,glu)
|
||||||
|
("gtk+" ,gtk+)
|
||||||
|
("libarchive" ,libarchive)
|
||||||
|
("mesa" ,mesa)
|
||||||
|
("sdl2" ,sdl2)
|
||||||
|
("zlib" ,zlib)))
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
;; The Nestopia build system consists solely of a Makefile.
|
||||||
|
(delete 'configure)
|
||||||
|
;; XXX Should be unnecessary with the next release.
|
||||||
|
(add-before
|
||||||
|
'build 'patch-makefile
|
||||||
|
(lambda _
|
||||||
|
(substitute* "Makefile"
|
||||||
|
(("@mkdir \\$@") "@mkdir -p $@")
|
||||||
|
(("CC =") "CC ?=")
|
||||||
|
(("CXX =") "CXX ?=")
|
||||||
|
(("PREFIX =") "PREFIX ?=")
|
||||||
|
(("^install:\n$") "install:\n\tmkdir -p $(BINDIR)\n"))))
|
||||||
|
(add-before
|
||||||
|
'build 'remove-xdg-desktop-menu-call
|
||||||
|
(lambda _
|
||||||
|
(substitute* "Makefile"
|
||||||
|
(("xdg-desktop-menu install .*") "")))))
|
||||||
|
#:make-flags (let ((out (assoc-ref %outputs "out")))
|
||||||
|
(list "CC=gcc" "CXX=g++" (string-append "PREFIX=" out)))
|
||||||
|
;; There are no tests.
|
||||||
|
#:tests? #f))
|
||||||
|
(home-page "http://0ldsk00l.ca/nestopia/")
|
||||||
|
(synopsis "Nintendo Entertainment System (NES/Famicom) emulator")
|
||||||
|
(description
|
||||||
|
"Nestopia UE (Undead Edition) is a fork of the Nintendo Entertainment
|
||||||
|
System (NES/Famicom) emulator Nestopia, with enhancements from members of the
|
||||||
|
emulation community. It provides highly accurate emulation.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public emulation-station
|
||||||
|
(package
|
||||||
|
(name "emulation-station")
|
||||||
|
(version "2.0.1")
|
||||||
|
(source (origin
|
||||||
|
(method git-fetch) ; no tarball available
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/Aloshi/EmulationStation.git")
|
||||||
|
(commit "646bede"))) ; no version tag
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v"))))
|
||||||
|
(build-system cmake-build-system)
|
||||||
|
(arguments
|
||||||
|
'(#:tests? #f)) ; no tests
|
||||||
|
(inputs
|
||||||
|
`(("alsa-lib" ,alsa-lib)
|
||||||
|
("boost" ,boost)
|
||||||
|
("curl" ,curl)
|
||||||
|
("eigin" ,eigen)
|
||||||
|
("freeimage" ,freeimage)
|
||||||
|
("freetype" ,freetype)
|
||||||
|
("mesa" ,mesa)
|
||||||
|
("sdl2" ,sdl2)))
|
||||||
|
(synopsis "Video game console emulator front-end")
|
||||||
|
(description "EmulationStation provides a graphical front-end to a large
|
||||||
|
number of video game console emulators. It features an interface that is
|
||||||
|
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)))
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2014 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2014, 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
|
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
|
|
@ -27,6 +27,7 @@
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages multiprecision)
|
#:use-module (gnu packages multiprecision)
|
||||||
#:use-module (gnu packages texinfo)
|
#:use-module (gnu packages texinfo)
|
||||||
|
#:use-module (gnu packages dejagnu)
|
||||||
#:use-module (gnu packages doxygen)
|
#:use-module (gnu packages doxygen)
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (gnu packages docbook)
|
#:use-module (gnu packages docbook)
|
||||||
|
|
@ -436,6 +437,9 @@ using compilers other than GCC."
|
||||||
(define-public gfortran
|
(define-public gfortran
|
||||||
(custom-gcc gcc "gfortran" '("fortran")))
|
(custom-gcc gcc "gfortran" '("fortran")))
|
||||||
|
|
||||||
|
(define-public gfortran-5
|
||||||
|
(custom-gcc gcc-5 "gfortran" '("fortran")))
|
||||||
|
|
||||||
(define-public gccgo-4.8
|
(define-public gccgo-4.8
|
||||||
(custom-gcc gcc-4.8 "gccgo" '("go")
|
(custom-gcc gcc-4.8 "gccgo" '("go")
|
||||||
;; Suppress the separate "lib" output, because otherwise the
|
;; Suppress the separate "lib" output, because otherwise the
|
||||||
|
|
@ -461,6 +465,9 @@ using compilers other than GCC."
|
||||||
("javac.in" ,javac.in)
|
("javac.in" ,javac.in)
|
||||||
("ecj-bootstrap" ,ecj-bootstrap)
|
("ecj-bootstrap" ,ecj-bootstrap)
|
||||||
,@(package-inputs gcc)))
|
,@(package-inputs gcc)))
|
||||||
|
(native-inputs
|
||||||
|
`(("dejagnu" ,dejagnu)
|
||||||
|
,@(package-native-inputs gcc)))
|
||||||
;; Suppress the separate "lib" output, because otherwise the
|
;; Suppress the separate "lib" output, because otherwise the
|
||||||
;; "lib" and "out" outputs would refer to each other, creating
|
;; "lib" and "out" outputs would refer to each other, creating
|
||||||
;; a cyclic dependency. <http://debbugs.gnu.org/18101>
|
;; a cyclic dependency. <http://debbugs.gnu.org/18101>
|
||||||
|
|
@ -472,7 +479,9 @@ using compilers other than GCC."
|
||||||
(ice-9 regex)
|
(ice-9 regex)
|
||||||
(srfi srfi-1)
|
(srfi srfi-1)
|
||||||
(srfi srfi-26))
|
(srfi srfi-26))
|
||||||
,@(package-arguments gcc))
|
#:test-target "check-target-libjava"
|
||||||
|
,@(package-arguments gcc))
|
||||||
|
((#:tests? _) #t)
|
||||||
((#:configure-flags flags)
|
((#:configure-flags flags)
|
||||||
`(let ((ecj (assoc-ref %build-inputs "ecj-bootstrap")))
|
`(let ((ecj (assoc-ref %build-inputs "ecj-bootstrap")))
|
||||||
`("--enable-java-home"
|
`("--enable-java-home"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||||
|
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -36,14 +37,14 @@
|
||||||
(define-public gdb
|
(define-public gdb
|
||||||
(package
|
(package
|
||||||
(name "gdb")
|
(name "gdb")
|
||||||
(version "7.10")
|
(version "7.10.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnu/gdb/gdb-"
|
(uri (string-append "mirror://gnu/gdb/gdb-"
|
||||||
version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1a08c9svaihqmz2mm44il1gwa810gmwkckns8b0y0v3qz52amgby"))))
|
"1mfnjcwnwm5cg4rc9pncs9v356a0bz6ymjyac56mbj6784yjzir5"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; FIXME "make check" fails on single-processor systems.
|
`(#:tests? #f ; FIXME "make check" fails on single-processor systems.
|
||||||
|
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
|
||||||
;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
|
|
||||||
;;;
|
|
||||||
;;; This file is part of GNU Guix.
|
|
||||||
;;;
|
|
||||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
||||||
;;; under the terms of the GNU General Public License as published by
|
|
||||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
||||||
;;; your option) any later version.
|
|
||||||
;;;
|
|
||||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
||||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
;;; GNU General Public License for more details.
|
|
||||||
;;;
|
|
||||||
;;; You should have received a copy of the GNU General Public License
|
|
||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
(define-module (gnu packages gdbm)
|
|
||||||
#:use-module (guix licenses)
|
|
||||||
#:use-module (guix packages)
|
|
||||||
#:use-module (guix download)
|
|
||||||
#:use-module (guix build-system gnu))
|
|
||||||
|
|
||||||
(define-public gdbm
|
|
||||||
(package
|
|
||||||
(name "gdbm")
|
|
||||||
(version "1.11")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (string-append "mirror://gnu/gdbm/gdbm-"
|
|
||||||
version ".tar.gz"))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1hz3jgh3pd4qzp6jy0l8pd8x01g9abw7csnrlnj1a2sxy122z4cd"))))
|
|
||||||
(arguments `(#:configure-flags '("--enable-libgdbm-compat")))
|
|
||||||
(build-system gnu-build-system)
|
|
||||||
(home-page "http://www.gnu.org/software/gdbm/")
|
|
||||||
(synopsis
|
|
||||||
"Hash library of database functions compatible with traditional dbm")
|
|
||||||
(description
|
|
||||||
"GDBM is a library for manipulating hashed databases. It is used to
|
|
||||||
store key/value pairs in a file in a manner similar to the Unix dbm library
|
|
||||||
and provides interfaces to the traditional file format.")
|
|
||||||
(license gpl3+)))
|
|
||||||
|
|
@ -53,7 +53,8 @@ and XMP metadata of images in various formats.")
|
||||||
|
|
||||||
;; Files under `xmpsdk' are a copy of Adobe's XMP SDK, licensed under the
|
;; Files under `xmpsdk' are a copy of Adobe's XMP SDK, licensed under the
|
||||||
;; 3-clause BSD license: <http://www.adobe.com/devnet/xmp/sdk/eula.html>.
|
;; 3-clause BSD license: <http://www.adobe.com/devnet/xmp/sdk/eula.html>.
|
||||||
;; The core is GPLv2+: <https://launchpad.net/ubuntu/precise/+source/exiv2/+copyright>.
|
;; The core is GPLv2+:
|
||||||
|
;; <https://launchpad.net/ubuntu/precise/+source/exiv2/+copyright>.
|
||||||
(license l:gpl2+)))
|
(license l:gpl2+)))
|
||||||
|
|
||||||
(define-public geeqie
|
(define-public geeqie
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ provided as well as the framework to add new color models and data types.")
|
||||||
(version "0.2.0")
|
(version "0.2.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (list (string-append "http://download.gimp.org/pub/gegl/"
|
(uri (list (string-append "http://download.gimp.org/pub/gegl/"
|
||||||
(string-take version 3)
|
(string-take version 3)
|
||||||
"/" name "-" version ".tar.bz2")))
|
"/" name "-" version ".tar.bz2")))
|
||||||
(sha256
|
(sha256
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (guix build-system cmake)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages autotools)
|
||||||
|
|
@ -48,14 +49,15 @@
|
||||||
(name "glu")
|
(name "glu")
|
||||||
(version "9.0.0")
|
(version "9.0.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-"
|
(uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-"
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0r72yyhj09x3krn3kn629jqbwyq50ji8w5ri2pn6zwrk35m4g1s3"))))
|
(base32
|
||||||
|
"0r72yyhj09x3krn3kn629jqbwyq50ji8w5ri2pn6zwrk35m4g1s3"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("mesa" ,mesa))) ; according to glu.pc
|
`(("mesa" ,mesa))) ; according to glu.pc
|
||||||
(home-page "http://www.opengl.org/archives/resources/faq/technical/glu.htm")
|
(home-page "http://www.opengl.org/archives/resources/faq/technical/glu.htm")
|
||||||
(synopsis "Mesa OpenGL Utility library")
|
(synopsis "Mesa OpenGL Utility library")
|
||||||
(description
|
(description
|
||||||
|
|
@ -74,21 +76,24 @@ as ASCII text.")
|
||||||
(define-public freeglut
|
(define-public freeglut
|
||||||
(package
|
(package
|
||||||
(name "freeglut")
|
(name "freeglut")
|
||||||
(version "2.8.1")
|
(version "3.0.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://sourceforge/project/freeglut/freeglut/"
|
(uri (string-append
|
||||||
version "/freeglut-" version ".tar.gz"))
|
"mirror://sourceforge/project/freeglut/freeglut/"
|
||||||
(sha256
|
version "/freeglut-" version ".tar.gz"))
|
||||||
(base32 "16lrxxxd9ps9l69y3zsw6iy0drwjsp6m26d1937xj71alqk6dr6x"))))
|
(sha256
|
||||||
(build-system gnu-build-system)
|
(base32
|
||||||
|
"18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra"))))
|
||||||
|
(build-system cmake-build-system)
|
||||||
|
(arguments '(#:tests? #f)) ; no test target
|
||||||
(inputs `(("mesa" ,mesa)
|
(inputs `(("mesa" ,mesa)
|
||||||
("libx11" ,libx11)
|
("libx11" ,libx11)
|
||||||
("libxi" ,libxi)
|
("libxi" ,libxi)
|
||||||
("libxrandr" ,libxrandr)
|
("libxrandr" ,libxrandr)
|
||||||
("libxxf86vm" ,libxxf86vm)
|
("libxxf86vm" ,libxxf86vm)
|
||||||
("inputproto" ,inputproto)
|
("inputproto" ,inputproto)
|
||||||
("xinput" ,xinput)))
|
("xinput" ,xinput)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
;; Headers from Mesa and GLU are needed.
|
;; Headers from Mesa and GLU are needed.
|
||||||
`(("glu" ,glu)
|
`(("glu" ,glu)
|
||||||
|
|
@ -114,17 +119,19 @@ the X-Consortium license.")
|
||||||
(name "ftgl")
|
(name "ftgl")
|
||||||
(version "2.1.3-rc5")
|
(version "2.1.3-rc5")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://sourceforge/project/ftgl/FTGL%20Source/2.1.3~rc5/ftgl-"
|
(uri (string-append
|
||||||
version ".tar.gz"))
|
"mirror://sourceforge/project/ftgl/FTGL%20Source/2.1.3~rc5/"
|
||||||
(sha256
|
"ftgl-" version ".tar.gz"))
|
||||||
(base32 "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"))))
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
;; The pkg-config file lists "freetype2" as Requires.private.
|
;; The pkg-config file lists "freetype2" as Requires.private.
|
||||||
(propagated-inputs `(("freetype" ,freetype)))
|
(propagated-inputs `(("freetype" ,freetype)))
|
||||||
(inputs `(("libx11" ,libx11)
|
(inputs `(("libx11" ,libx11)
|
||||||
("mesa" ,mesa)
|
("mesa" ,mesa)
|
||||||
("glu" ,glu)))
|
("glu" ,glu)))
|
||||||
(home-page "http://ftgl.sourceforge.net")
|
(home-page "http://ftgl.sourceforge.net")
|
||||||
(synopsis "Font rendering library for OpenGL applications")
|
(synopsis "Font rendering library for OpenGL applications")
|
||||||
(description
|
(description
|
||||||
|
|
@ -185,7 +192,7 @@ also known as DXTn or DXTC) for Mesa.")
|
||||||
(define-public mesa
|
(define-public mesa
|
||||||
(package
|
(package
|
||||||
(name "mesa")
|
(name "mesa")
|
||||||
(version "10.5.4")
|
(version "11.0.3")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -193,7 +200,7 @@ also known as DXTn or DXTC) for Mesa.")
|
||||||
version "/mesa-" version ".tar.xz"))
|
version "/mesa-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"00v89jna7m6r2w1yrnx09isc97r2bd1hkn4jib445n1078zp47mm"))))
|
"1mikw0biw0wxq0fn3cp18bm6kjrkd66fy84774yc5b91rvp94adb"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("glproto" ,glproto)
|
`(("glproto" ,glproto)
|
||||||
|
|
@ -257,12 +264,10 @@ also known as DXTn or DXTC) for Mesa.")
|
||||||
"src/mesa/main/texcompress_s3tc.c")
|
"src/mesa/main/texcompress_s3tc.c")
|
||||||
(("\"libtxc_dxtn\\.so")
|
(("\"libtxc_dxtn\\.so")
|
||||||
(string-append "\"" s2tc "/lib/libtxc_dxtn.so")))
|
(string-append "\"" s2tc "/lib/libtxc_dxtn.so")))
|
||||||
(substitute* "src/gallium/targets/egl-static/egl_st.c"
|
|
||||||
(("\"libglapi\"")
|
|
||||||
(string-append "\"" out "/lib/libglapi\"")))
|
|
||||||
(substitute* "src/loader/loader.c"
|
(substitute* "src/loader/loader.c"
|
||||||
(("dlopen\\(\"libudev\\.so")
|
(("udev_handle = dlopen\\(name")
|
||||||
(string-append "dlopen(\"" udev "/lib/libudev.so")))
|
(string-append "udev_handle = dlopen(\""
|
||||||
|
udev "/lib/libudev.so\"")))
|
||||||
(substitute* "src/glx/dri_common.c"
|
(substitute* "src/glx/dri_common.c"
|
||||||
(("dlopen\\(\"libGL\\.so")
|
(("dlopen\\(\"libGL\\.so")
|
||||||
(string-append "dlopen(\"" out "/lib/libGL.so")))
|
(string-append "dlopen(\"" out "/lib/libGL.so")))
|
||||||
|
|
@ -327,7 +332,12 @@ emulation to complete hardware acceleration for modern GPUs.")
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)))
|
`(("pkg-config" ,pkg-config)))
|
||||||
(arguments
|
(arguments
|
||||||
'(#:phases
|
'(;; XXX: fails to build against latest mesa:
|
||||||
|
;; eglut.c: error: 'EGL_SCREEN_BIT_MESA' undeclared
|
||||||
|
;;
|
||||||
|
;; <https://bugs.freedesktop.org/show_bug.cgi?id=91643>
|
||||||
|
#:configure-flags '("--disable-egl")
|
||||||
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(replace
|
(replace
|
||||||
'install
|
'install
|
||||||
|
|
|
||||||
|
|
@ -57,36 +57,44 @@
|
||||||
(define dbus
|
(define dbus
|
||||||
(package
|
(package
|
||||||
(name "dbus")
|
(name "dbus")
|
||||||
(version "1.8.16")
|
(version "1.10.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
;; TODO: Apply patch from DBUS/ACTIVATION below.
|
||||||
(uri
|
(method url-fetch)
|
||||||
(string-append "http://dbus.freedesktop.org/releases/dbus/dbus-"
|
(uri (string-append
|
||||||
version ".tar.gz"))
|
"http://dbus.freedesktop.org/releases/dbus/dbus-"
|
||||||
(sha256
|
version ".tar.gz"))
|
||||||
(base32
|
(sha256
|
||||||
"01rba8mp8kqvmy6ibdmi806kjr3m14swnskqk02gyhykxxl54ybz"))
|
(base32
|
||||||
(patches (list (search-patch "dbus-localstatedir.patch")))))
|
"0jwj7wlrhq5y0fwfh8k2d9rgdpfax06lj8698g6iqbwrzd2rgyqx"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:configure-flags (list ;; Install the system bus socket under /var.
|
'(#:configure-flags
|
||||||
"--localstatedir=/var"
|
(list
|
||||||
|
;; Install the system bus socket under /var.
|
||||||
|
"--localstatedir=/var"
|
||||||
|
|
||||||
;; XXX: Fix the following to allow system-wide
|
;; Install the session bus socket under /tmp.
|
||||||
;; config.
|
"--with-session-socket-dir=/tmp"
|
||||||
;; "--sysconfdir=/etc"
|
|
||||||
|
|
||||||
"--with-session-socket-dir=/tmp")
|
;; Use /etc/dbus-1 for system-wide config.
|
||||||
#:phases (alist-cons-after
|
;; Look for configuration file under
|
||||||
'install 'post-install
|
;; /etc/dbus-1. This is notably required by
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
;; 'dbus-daemon-launch-helper', which looks for
|
||||||
;; 'dbus-launch' bails out if the 'session.d' directory
|
;; the 'system.conf' file in that place,
|
||||||
;; below is missing, so create it along with its companion.
|
;; regardless of what '--config-file' was
|
||||||
(let ((out (assoc-ref outputs "out")))
|
;; passed to 'dbus-daemon' on the command line;
|
||||||
(mkdir (string-append out "/etc/dbus-1/session.d"))
|
;; see <https://bugs.freedesktop.org/show_bug.cgi?id=92458>.
|
||||||
(mkdir (string-append out "/etc/dbus-1/system.d"))
|
"--sysconfdir=/etc")
|
||||||
#t))
|
#:phases
|
||||||
%standard-phases)))
|
(modify-phases %standard-phases
|
||||||
|
(replace 'install
|
||||||
|
(lambda _
|
||||||
|
;; Don't try to create /var and /etc.
|
||||||
|
(system* "make"
|
||||||
|
"localstatedir=/tmp/dummy"
|
||||||
|
"sysconfdir=/tmp/dummy"
|
||||||
|
"install"))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)))
|
`(("pkg-config" ,pkg-config)))
|
||||||
(inputs
|
(inputs
|
||||||
|
|
@ -116,10 +124,21 @@ or through unencrypted TCP/IP suitable for use behind a firewall with
|
||||||
shared NFS home directories.")
|
shared NFS home directories.")
|
||||||
(license license:gpl2+))) ; or Academic Free License 2.1
|
(license license:gpl2+))) ; or Academic Free License 2.1
|
||||||
|
|
||||||
|
(define-public dbus/activation
|
||||||
|
;; D-Bus with a patch to fix service activation.
|
||||||
|
;; TODO: Merge with DBUS above.
|
||||||
|
(package
|
||||||
|
(inherit dbus)
|
||||||
|
(version (string-append (package-version dbus) ".a"))
|
||||||
|
(source (origin
|
||||||
|
(inherit (package-source dbus))
|
||||||
|
(patches
|
||||||
|
(list (search-patch "dbus-helper-search-path.patch")))))))
|
||||||
|
|
||||||
(define glib
|
(define glib
|
||||||
(package
|
(package
|
||||||
(name "glib")
|
(name "glib")
|
||||||
(version "2.44.1")
|
(version "2.46.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/"
|
(uri (string-append "mirror://gnome/sources/"
|
||||||
|
|
@ -127,7 +146,7 @@ shared NFS home directories.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"01yabrfp64i11mrks3p1gcks99lw0zm7f5vhkc53sl4amyndw4c8"))
|
"1yzxr1ip3l0m9ydk5nq32piq70c9f17p5f0jyvlsghzbaawh67ss"))
|
||||||
(patches (list (search-patch "glib-tests-homedir.patch")
|
(patches (list (search-patch "glib-tests-homedir.patch")
|
||||||
(search-patch "glib-tests-desktop.patch")
|
(search-patch "glib-tests-desktop.patch")
|
||||||
(search-patch "glib-tests-prlimit.patch")
|
(search-patch "glib-tests-prlimit.patch")
|
||||||
|
|
@ -169,7 +188,8 @@ shared NFS home directories.")
|
||||||
|
|
||||||
;; Disable a test that requires dbus.
|
;; Disable a test that requires dbus.
|
||||||
(substitute* "gio/tests/gdbus-serialization.c"
|
(substitute* "gio/tests/gdbus-serialization.c"
|
||||||
(("g_test_add_func \\(\"/gdbus/message-serialize/double-array\", test_double_array\\);" all)
|
(("g_test_add_func \
|
||||||
|
\\(\"/gdbus/message-serialize/double-array\", test_double_array\\);" all)
|
||||||
(string-append "/* " all " */"))))
|
(string-append "/* " all " */"))))
|
||||||
%standard-phases)
|
%standard-phases)
|
||||||
|
|
||||||
|
|
@ -207,14 +227,18 @@ dynamic loading, and an object system.")
|
||||||
(define gobject-introspection
|
(define gobject-introspection
|
||||||
(package
|
(package
|
||||||
(name "gobject-introspection")
|
(name "gobject-introspection")
|
||||||
(version "1.44.0")
|
(version "1.46.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/"
|
(uri (string-append "mirror://gnome/sources/"
|
||||||
"gobject-introspection/" (version-major+minor version)
|
"gobject-introspection/" (version-major+minor version)
|
||||||
"/gobject-introspection-" version ".tar.xz"))
|
"/gobject-introspection-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1b972qg2yb51sdavfvb6kc19akwc15c1bwnbg81vadxamql2q33g"))
|
(base32 "0cs27r18fga44ypp8icy62fwx6nh70r1bvhi4lzfn4w85cybsn36"))
|
||||||
|
(modules '((guix build utils)))
|
||||||
|
(snippet
|
||||||
|
'(substitute* "tools/g-ir-tool-template.in"
|
||||||
|
(("#!/usr/bin/env @PYTHON@") "#!@PYTHON@")))
|
||||||
(patches (list
|
(patches (list
|
||||||
(search-patch "gobject-introspection-cc.patch")
|
(search-patch "gobject-introspection-cc.patch")
|
||||||
(search-patch
|
(search-patch
|
||||||
|
|
@ -258,7 +282,7 @@ bindings to call into the C library.")
|
||||||
(define intltool
|
(define intltool
|
||||||
(package
|
(package
|
||||||
(name "intltool")
|
(name "intltool")
|
||||||
(version "0.50.2")
|
(version "0.51.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://launchpad.net/intltool/trunk/"
|
(uri (string-append "https://launchpad.net/intltool/trunk/"
|
||||||
|
|
@ -266,7 +290,7 @@ bindings to call into the C library.")
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7"))))
|
"1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("file" ,file)))
|
`(("file" ,file)))
|
||||||
|
|
@ -382,7 +406,7 @@ by GDBus included in Glib.")
|
||||||
(define libsigc++
|
(define libsigc++
|
||||||
(package
|
(package
|
||||||
(name "libsigc++")
|
(name "libsigc++")
|
||||||
(version "2.4.1")
|
(version "2.6.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/libsigc++/"
|
(uri (string-append "mirror://gnome/sources/libsigc++/"
|
||||||
|
|
@ -390,7 +414,7 @@ by GDBus included in Glib.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1v0rvkzglzmf67y9nkcppwjwi68j1cy5yhldvcq7xrv8594l612l"))))
|
"06xyvxaaxh3nbpjg86gcq5zcc2qnpx354wcfrqlhbndkq5kj2vqq"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs `(("pkg-config" ,pkg-config)
|
(native-inputs `(("pkg-config" ,pkg-config)
|
||||||
("m4" ,m4)))
|
("m4" ,m4)))
|
||||||
|
|
@ -409,7 +433,7 @@ has an ease of use unmatched by other C++ callback libraries.")
|
||||||
(define glibmm
|
(define glibmm
|
||||||
(package
|
(package
|
||||||
(name "glibmm")
|
(name "glibmm")
|
||||||
(version "2.44.0")
|
(version "2.46.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/glibmm/"
|
(uri (string-append "mirror://gnome/sources/glibmm/"
|
||||||
|
|
@ -417,7 +441,7 @@ has an ease of use unmatched by other C++ callback libraries.")
|
||||||
"/glibmm-" version ".tar.xz"))
|
"/glibmm-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1a1fczy7hcpn24fglyn4i79f4yjc8s50is70q03mb294bm1c02hv"))))
|
"1an4v1yk06svlmcyp1psk2a3bsn29s1a4gdx0ai2w788q6bfaiwn"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases (alist-cons-before
|
`(#:phases (alist-cons-before
|
||||||
|
|
@ -491,7 +515,7 @@ useful for C++.")
|
||||||
(define-public python-pygobject
|
(define-public python-pygobject
|
||||||
(package
|
(package
|
||||||
(name "python-pygobject")
|
(name "python-pygobject")
|
||||||
(version "3.16.1")
|
(version "3.18.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -500,7 +524,7 @@ useful for C++.")
|
||||||
"/pygobject-" version ".tar.xz"))
|
"/pygobject-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1hqyma73w0lnjcgx68kawhnq84aq92xlkdqphrlc2ppia38dm5kx"))))
|
"1jbd2m39vcjh5h3m33l0317ziq8dxfzi40r6hrfcs4rp5l8s2fqw"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("which" ,which)
|
`(("which" ,which)
|
||||||
|
|
@ -551,18 +575,30 @@ useful for C++.")
|
||||||
"telepathy-glib-" version ".tar.gz"))
|
"telepathy-glib-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy"))))
|
"1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy"))
|
||||||
|
(patches
|
||||||
|
(list
|
||||||
|
;; Don't use the same test name for multiple tests.
|
||||||
|
;; <https://bugs.freedesktop.org/show_bug.cgi?id=92245>
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri "https://bugs.freedesktop.org/attachment.cgi?id=118608")
|
||||||
|
(file-name (string-append "telepathy-glib-duplicate-tests.patch"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0z261fwrszxb28ccg3hsg9rizig4s84zvwmx6y31a4pyv7bvs5w3")))))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("glib" ,glib "bin") ; uses glib-mkenums
|
`(("glib" ,glib "bin") ; uses glib-mkenums
|
||||||
|
("gobject-introspection" ,gobject-introspection)
|
||||||
("pkg-config" ,pkg-config)
|
("pkg-config" ,pkg-config)
|
||||||
("python" ,python-2)))
|
("python" ,python-2)
|
||||||
(inputs
|
("xsltproc" ,libxslt)))
|
||||||
|
(propagated-inputs
|
||||||
|
;; There are all in the Requires.private field of telepathy-glib.pc.
|
||||||
`(("dbus" ,dbus)
|
`(("dbus" ,dbus)
|
||||||
("dbus-glib" ,dbus-glib)
|
("dbus-glib" ,dbus-glib)
|
||||||
("glib" ,glib)
|
("glib" ,glib)))
|
||||||
("gobject-introspection" ,gobject-introspection)
|
|
||||||
("libxslt" ,libxslt)))
|
|
||||||
(home-page "http://telepathy.freedesktop.org/wiki/")
|
(home-page "http://telepathy.freedesktop.org/wiki/")
|
||||||
(synopsis "GLib Real-time communications framework over D-Bus")
|
(synopsis "GLib Real-time communications framework over D-Bus")
|
||||||
(description "Telepathy is a flexible, modular communications framework
|
(description "Telepathy is a flexible, modular communications framework
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -37,7 +37,7 @@
|
||||||
(define-public gnucash
|
(define-public gnucash
|
||||||
(package
|
(package
|
||||||
(name "gnucash")
|
(name "gnucash")
|
||||||
(version "2.6.6")
|
(version "2.6.9")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -45,7 +45,7 @@
|
||||||
version ".tar.bz2"))
|
version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"103ir5qg6k8m2mmg9b99c3gn8myxh1gsqyr0mfhmrhqya68wfdr3"))
|
"0iw25l1kv60cg6fd2vg11mcvzmjqnc5p9lp3rjy06ghkjfrn3and"))
|
||||||
(patches (list (search-patch "gnucash-price-quotes-perl.patch")))))
|
(patches (list (search-patch "gnucash-price-quotes-perl.patch")))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
|
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
|
||||||
;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
|
;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
|
||||||
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
||||||
|
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -29,6 +30,7 @@
|
||||||
#:use-module (gnu packages glib)
|
#:use-module (gnu packages glib)
|
||||||
#:use-module (gnu packages gnupg)
|
#:use-module (gnu packages gnupg)
|
||||||
#:use-module (gnu packages groff)
|
#:use-module (gnu packages groff)
|
||||||
|
#:use-module (gnu packages guile)
|
||||||
#:use-module (gnu packages gstreamer)
|
#:use-module (gnu packages gstreamer)
|
||||||
#:use-module (gnu packages libidn)
|
#:use-module (gnu packages libidn)
|
||||||
#:use-module (gnu packages image)
|
#:use-module (gnu packages image)
|
||||||
|
|
@ -45,6 +47,7 @@
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix git-download)
|
||||||
#:use-module (guix build-system gnu))
|
#:use-module (guix build-system gnu))
|
||||||
|
|
||||||
(define-public libextractor
|
(define-public libextractor
|
||||||
|
|
@ -111,14 +114,14 @@ tool to extract metadata from a file and print the results.")
|
||||||
(define-public libmicrohttpd
|
(define-public libmicrohttpd
|
||||||
(package
|
(package
|
||||||
(name "libmicrohttpd")
|
(name "libmicrohttpd")
|
||||||
(version "0.9.44")
|
(version "0.9.47")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
|
(uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"07j1p21rvbrrfpxngk8xswzkmjkh94bp1971xfjh1p0ja709qwzj"))))
|
"1335kznai5ih3kmavl1707sr4sakk0cc0srl5aax77x0a91spgcn"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("curl" ,curl)
|
`(("curl" ,curl)
|
||||||
|
|
@ -250,3 +253,36 @@ applications. In particular, GNUnet now includes the GNU Name System, a
|
||||||
privacy-preserving, decentralized public key infrastructure.")
|
privacy-preserving, decentralized public key infrastructure.")
|
||||||
(license license:gpl3+)
|
(license license:gpl3+)
|
||||||
(home-page "https://gnunet.org/")))
|
(home-page "https://gnunet.org/")))
|
||||||
|
|
||||||
|
(define-public guile-gnunet ;GSoC 2015!
|
||||||
|
(let ((commit "383eac2"))
|
||||||
|
(package
|
||||||
|
(name "guile-gnunet")
|
||||||
|
(version (string-append "0.0." commit))
|
||||||
|
(source (origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "git://git.sv.gnu.org/guix/gnunet.git")
|
||||||
|
(commit commit)))
|
||||||
|
(file-name (string-append name "-" version "-checkout"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0k6mn28isjlxrnvbnblab3nh2xqx1b7san8k98kc35ap9lq0iz8w"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
'(#:phases (modify-phases %standard-phases
|
||||||
|
(add-before 'configure 'bootstrap
|
||||||
|
(lambda _
|
||||||
|
(zero? (system* "autoreconf" "-vfi")))))))
|
||||||
|
(native-inputs `(("pkg-config" ,pkg-config)
|
||||||
|
("autoconf" ,(autoconf-wrapper))
|
||||||
|
("automake" ,automake)))
|
||||||
|
(inputs `(("guile" ,guile-2.0)
|
||||||
|
("gnunet" ,gnunet)))
|
||||||
|
(synopsis "Guile bindings for GNUnet services")
|
||||||
|
(description
|
||||||
|
"This package provides Guile bindings to the client libraries of various
|
||||||
|
GNUnet services, including the @dfn{identity} and @dfn{file sharing}
|
||||||
|
services.")
|
||||||
|
(home-page "http://gnu.org/software/guix")
|
||||||
|
(license license:gpl3+))))
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
||||||
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||||
|
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -22,6 +23,7 @@
|
||||||
|
|
||||||
(define-module (gnu packages gnupg)
|
(define-module (gnu packages gnupg)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (gnu packages adns)
|
||||||
#:use-module (gnu packages curl)
|
#:use-module (gnu packages curl)
|
||||||
#:use-module (gnu packages openldap)
|
#:use-module (gnu packages openldap)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
|
|
@ -31,6 +33,7 @@
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages gtk)
|
#:use-module (gnu packages gtk)
|
||||||
#:use-module (gnu packages glib)
|
#:use-module (gnu packages glib)
|
||||||
|
#:use-module (gnu packages gnome)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages ncurses)
|
#:use-module (gnu packages ncurses)
|
||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages tls)
|
||||||
|
|
@ -110,7 +113,7 @@ generation.")
|
||||||
(define-public libassuan
|
(define-public libassuan
|
||||||
(package
|
(package
|
||||||
(name "libassuan")
|
(name "libassuan")
|
||||||
(version "2.2.1")
|
(version "2.4.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -118,7 +121,7 @@ generation.")
|
||||||
version ".tar.bz2"))
|
version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1pp2kl5gc2vja41g3wk03h1hgh7gxy6pj354fb5n4lrlg6xqb4ll"))))
|
"086bbcdnvs48qq5g4iac7dpk76j0q3jrp16mchdvyx0b720xq1mv"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("libgpg-error" ,libgpg-error) ("pth" ,pth)))
|
`(("libgpg-error" ,libgpg-error) ("pth" ,pth)))
|
||||||
|
|
@ -193,19 +196,20 @@ compatible to GNU Pth.")
|
||||||
(define-public gnupg
|
(define-public gnupg
|
||||||
(package
|
(package
|
||||||
(name "gnupg")
|
(name "gnupg")
|
||||||
(version "2.1.9")
|
(version "2.1.10")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
|
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
|
||||||
".tar.bz2"))
|
".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1dpp555glln6fldk72ad7lkrn8h3cr2bg714z5kfn2qrawx67dqw"))))
|
"1ybcsazjm21i2ys1wh49cz4azmqz7ghx5rb6hm4gm93i2zc5igck"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)))
|
`(("pkg-config" ,pkg-config)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("bzip2" ,bzip2)
|
`(("adns" ,adns)
|
||||||
|
("bzip2" ,bzip2)
|
||||||
("curl" ,curl)
|
("curl" ,curl)
|
||||||
("gnutls" ,gnutls)
|
("gnutls" ,gnutls)
|
||||||
("libassuan" ,libassuan)
|
("libassuan" ,libassuan)
|
||||||
|
|
@ -237,17 +241,18 @@ libskba (working with X.509 certificates and CMS data).")
|
||||||
|
|
||||||
(define-public gnupg-2.0
|
(define-public gnupg-2.0
|
||||||
(package (inherit gnupg)
|
(package (inherit gnupg)
|
||||||
(version "2.0.28")
|
(version "2.0.29")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
|
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
|
||||||
".tar.bz2"))
|
".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0k2k399fnhfhhr4dvm8d6vs4ihq6gg06191lzfwikzaqmgj2w2ff"))))
|
"1jaakn0mi6pi2b3g3imxj3qzxw2zg0ifxs30baq2b157dcw6pvb8"))))
|
||||||
(native-inputs '())
|
(native-inputs '())
|
||||||
(inputs
|
(inputs
|
||||||
`(("bzip2" ,bzip2)
|
`(("adns" ,adns)
|
||||||
|
("bzip2" ,bzip2)
|
||||||
("curl" ,curl)
|
("curl" ,curl)
|
||||||
("libassuan" ,libassuan)
|
("libassuan" ,libassuan)
|
||||||
("libgcrypt" ,libgcrypt)
|
("libgcrypt" ,libgcrypt)
|
||||||
|
|
@ -294,7 +299,7 @@ libskba (working with X.509 certificates and CMS data).")
|
||||||
(define-public gpgme
|
(define-public gpgme
|
||||||
(package
|
(package
|
||||||
(name "gpgme")
|
(name "gpgme")
|
||||||
(version "1.5.5")
|
(version "1.6.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -302,7 +307,7 @@ libskba (working with X.509 certificates and CMS data).")
|
||||||
".tar.bz2"))
|
".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"01y28fkq52wwf4p470wscaxd2vgzl615irmafx3mj3380x8ksg8b"))))
|
"17892sclz3yg45wbyqqrzzpq3l0icbnfl28f101b3062g8cy97dh"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
;; Needs to be propagated because gpgme.h includes gpg-error.h.
|
;; Needs to be propagated because gpgme.h includes gpg-error.h.
|
||||||
|
|
@ -371,14 +376,15 @@ and signature functionality from Python programs.")
|
||||||
(define-public pius
|
(define-public pius
|
||||||
(package
|
(package
|
||||||
(name "pius")
|
(name "pius")
|
||||||
(version "2.1.1")
|
(version "2.2.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://sourceforge/pgpius/pius/"
|
(uri (string-append
|
||||||
version "/pius-"
|
"https://github.com/jaymzh/pius/releases/download/v"
|
||||||
version ".tar.bz2"))
|
version "/pius-" version ".tar.bz2"))
|
||||||
(sha256 (base32
|
(sha256
|
||||||
"0ry3kc3x1qjmvb581ja2z2v32r1rl1g8rhfj7iqvs8nzq4ca512i"))))
|
(base32
|
||||||
|
"003dwpamq0c7w8q9zpgi4h03rs8rwjm0czkn9s60m91p6aql5f42"))))
|
||||||
(build-system python-build-system)
|
(build-system python-build-system)
|
||||||
(inputs `(("perl" ,perl) ;for 'pius-party-worksheet'
|
(inputs `(("perl" ,perl) ;for 'pius-party-worksheet'
|
||||||
("gpg" ,gnupg-2.0))) ;2.1 fails to talk to gpg-agent 2.0
|
("gpg" ,gnupg-2.0))) ;2.1 fails to talk to gpg-agent 2.0
|
||||||
|
|
@ -393,7 +399,7 @@ and signature functionality from Python programs.")
|
||||||
(let* ((gpg (string-append (assoc-ref inputs "gpg")
|
(let* ((gpg (string-append (assoc-ref inputs "gpg")
|
||||||
"/bin/gpg2")))
|
"/bin/gpg2")))
|
||||||
(substitute* "libpius/constants.py"
|
(substitute* "libpius/constants.py"
|
||||||
(("/usr/bin/gpg") gpg))))))))
|
(("/usr/bin/gpg2") gpg))))))))
|
||||||
(synopsis "Programs to simplify GnuPG key signing")
|
(synopsis "Programs to simplify GnuPG key signing")
|
||||||
(description
|
(description
|
||||||
"Pius (PGP Individual UID Signer) helps attendees of PGP keysigning
|
"Pius (PGP Individual UID Signer) helps attendees of PGP keysigning
|
||||||
|
|
@ -510,18 +516,19 @@ including tools for signing keys, keyring analysis, and party preparation.
|
||||||
(define-public pinentry
|
(define-public pinentry
|
||||||
(package
|
(package
|
||||||
(name "pinentry")
|
(name "pinentry")
|
||||||
(version "0.9.5")
|
(version "0.9.6")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnupg/pinentry/pinentry-"
|
(uri (string-append "mirror://gnupg/pinentry/pinentry-"
|
||||||
version ".tar.bz2"))
|
version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1338hj1h3sh34897120y30x12b64wyj3xjzzk5asm2hdzhxgsmva"))))
|
"0rhyw1vk28kgasjp22myf7m2q8kycw82d65pr9kgh93z17lj849a"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("ncurses" ,ncurses)
|
`(("ncurses" ,ncurses)
|
||||||
("libassuan" ,libassuan)
|
("libassuan" ,libassuan)
|
||||||
|
("libsecret" ,libsecret "out")
|
||||||
("gtk+" ,gtk+-2)
|
("gtk+" ,gtk+-2)
|
||||||
("glib" ,glib)))
|
("glib" ,glib)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
|
|
|
||||||
|
|
@ -92,10 +92,48 @@
|
||||||
in C/C++.")
|
in C/C++.")
|
||||||
(license license:mpl2.0))) ; and others for some files
|
(license license:mpl2.0))) ; and others for some files
|
||||||
|
|
||||||
|
(define-public mozjs-24
|
||||||
|
(package (inherit mozjs)
|
||||||
|
(name "mozjs")
|
||||||
|
(version "24.2.0")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://ftp.mozilla.org/pub/mozilla.org/js/"
|
||||||
|
name "-" version ".tar.bz2"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6"))))
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(replace
|
||||||
|
'configure
|
||||||
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
(let ((out (assoc-ref outputs "out")))
|
||||||
|
(chdir "js/src")
|
||||||
|
;; configure fails if it is follwed by SHELL and CONFIG_SHELL
|
||||||
|
(setenv "SHELL" (which "sh"))
|
||||||
|
(setenv "CONFIG_SHELL" (which "sh"))
|
||||||
|
(zero? (system* "./configure"
|
||||||
|
(string-append "--prefix=" out)
|
||||||
|
"--with-system-nspr"
|
||||||
|
"--enable-system-ffi"
|
||||||
|
"--enable-threadsafe"))))))))
|
||||||
|
(native-inputs
|
||||||
|
`(("perl" ,perl)
|
||||||
|
("pkg-config" ,pkg-config)
|
||||||
|
("python" ,python-2)))
|
||||||
|
(propagated-inputs
|
||||||
|
`(("nspr" ,nspr))) ; in the Requires.private field of mozjs-24.pc
|
||||||
|
(inputs
|
||||||
|
`(("libffi" ,libffi)
|
||||||
|
("zlib" ,zlib)))))
|
||||||
|
|
||||||
(define-public nspr
|
(define-public nspr
|
||||||
(package
|
(package
|
||||||
(name "nspr")
|
(name "nspr")
|
||||||
(version "4.10.8")
|
(version "4.10.10")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -103,7 +141,7 @@ in C/C++.")
|
||||||
version "/src/nspr-" version ".tar.gz"))
|
version "/src/nspr-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"05aaakz24ba2hdzlqx8qamwrsp7gni1acms8mr6m432wa9yaazjh"))))
|
"01ria9wk6329hxqsy75p9dkxiqkq4nkz0jjzll7hslih3jbi8dil"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("perl", perl)))
|
`(("perl", perl)))
|
||||||
|
|
@ -129,18 +167,18 @@ in the Mozilla clients.")
|
||||||
(define-public nss
|
(define-public nss
|
||||||
(package
|
(package
|
||||||
(name "nss")
|
(name "nss")
|
||||||
(version "3.19.2")
|
(version "3.20.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (let ((version-with-underscores
|
(uri (let ((version-with-underscores
|
||||||
(string-join (string-split version #\.) "_")))
|
(string-join (string-split version #\.) "_")))
|
||||||
(string-append
|
(string-append
|
||||||
"ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/"
|
"https://ftp.mozilla.org/pub/mozilla.org/security/nss/"
|
||||||
"releases/NSS_" version-with-underscores "_RTM/src/"
|
"releases/NSS_" version-with-underscores "_RTM/src/"
|
||||||
"nss-" version ".tar.gz")))
|
"nss-" version ".tar.gz")))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1bn9wbf52z4423134hpkyvcxq1568fvzmkybv2d49n31iwz6c1hk"))
|
"15wcbqd2b911hxafbjfn63zd1gf2yxg0s5560hnhqmyrvw8qyg5d"))
|
||||||
;; Create nss.pc and nss-config.
|
;; Create nss.pc and nss-config.
|
||||||
(patches (list (search-patch "nss-pkgconfig.patch")))))
|
(patches (list (search-patch "nss-pkgconfig.patch")))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
|
@ -228,7 +266,7 @@ standards.")
|
||||||
(define-public icecat
|
(define-public icecat
|
||||||
(package
|
(package
|
||||||
(name "icecat")
|
(name "icecat")
|
||||||
(version "38.3.0-gnu1")
|
(version "38.4.0-gnu1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -237,7 +275,7 @@ standards.")
|
||||||
name "-" version ".tar.bz2"))
|
name "-" version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0vm6f7f1i5vkq2713mgzjdfnm8rpz9l0q8sv4s123vsam0j9gzh8"))
|
"0rcaa19rfgclwd2qvcz8798m57jjzra6kaxg5dniysajvx7qndfp"))
|
||||||
(patches (map search-patch '("icecat-avoid-bundled-includes.patch"
|
(patches (map search-patch '("icecat-avoid-bundled-includes.patch"
|
||||||
"icecat-freetype-2.6.patch")))
|
"icecat-freetype-2.6.patch")))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||||
|
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -28,6 +29,8 @@
|
||||||
#:use-module (gnu packages fontutils)
|
#:use-module (gnu packages fontutils)
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages qemu)
|
#:use-module (gnu packages qemu)
|
||||||
|
#:use-module (gnu packages man)
|
||||||
|
#:use-module (gnu packages texinfo)
|
||||||
#:use-module (gnu packages ncurses)
|
#:use-module (gnu packages ncurses)
|
||||||
#:use-module (gnu packages cdrom)
|
#:use-module (gnu packages cdrom)
|
||||||
#:use-module (srfi srfi-1))
|
#:use-module (srfi srfi-1))
|
||||||
|
|
@ -38,7 +41,7 @@
|
||||||
;; <https://bugs.launchpad.net/bugs/947597> and fixed at
|
;; <https://bugs.launchpad.net/bugs/947597> and fixed at
|
||||||
;; <http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/4828>.
|
;; <http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/4828>.
|
||||||
;; Work around it by using an older QEMU.
|
;; Work around it by using an older QEMU.
|
||||||
(package (inherit qemu-headless)
|
(package (inherit qemu-minimal)
|
||||||
(version "1.3.1")
|
(version "1.3.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -52,7 +55,7 @@
|
||||||
;; ERROR:tests/rtc-test.c:176:check_time: assertion failed (ABS(t - s) <= wiggle): (382597824 <= 2)
|
;; ERROR:tests/rtc-test.c:176:check_time: assertion failed (ABS(t - s) <= wiggle): (382597824 <= 2)
|
||||||
;; Simply disable the tests.
|
;; Simply disable the tests.
|
||||||
(arguments `(#:tests? #f
|
(arguments `(#:tests? #f
|
||||||
,@(package-arguments qemu)))
|
,@(package-arguments qemu-minimal)))
|
||||||
|
|
||||||
;; The manual fails to build with Texinfo 5.x.
|
;; The manual fails to build with Texinfo 5.x.
|
||||||
(native-inputs (alist-delete "texinfo" (package-native-inputs qemu)))))
|
(native-inputs (alist-delete "texinfo" (package-native-inputs qemu)))))
|
||||||
|
|
@ -84,30 +87,35 @@
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:configure-flags '("--disable-werror")
|
'(#:configure-flags '("--disable-werror")
|
||||||
#:phases (alist-cons-before
|
#:phases (modify-phases %standard-phases
|
||||||
'patch-source-shebangs 'patch-stuff
|
(add-after
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
'unpack 'patch-stuff
|
||||||
(substitute* "grub-core/Makefile.in"
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(("/bin/sh") (which "sh")))
|
(substitute* "grub-core/Makefile.in"
|
||||||
|
(("/bin/sh") (which "sh")))
|
||||||
|
|
||||||
;; Make the font visible.
|
;; Make the font visible.
|
||||||
(copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
|
(copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
|
||||||
(system* "gunzip" "unifont.bdf.gz")
|
(system* "gunzip" "unifont.bdf.gz")
|
||||||
|
|
||||||
;; TODO: Re-enable this test when we have Parted.
|
;; TODO: Re-enable this test when we have Parted.
|
||||||
(substitute* "tests/partmap_test.in"
|
(substitute* "tests/partmap_test.in"
|
||||||
(("set -e") "exit 77")))
|
(("set -e") "exit 77"))
|
||||||
%standard-phases)))
|
|
||||||
|
#t)))))
|
||||||
(inputs
|
(inputs
|
||||||
`(;; ("lvm2" ,lvm2)
|
`(;; ("lvm2" ,lvm2)
|
||||||
("gettext" ,gnu-gettext)
|
("gettext" ,gnu-gettext)
|
||||||
("freetype" ,freetype)
|
("freetype" ,freetype)
|
||||||
;; ("libusb" ,libusb)
|
;; ("libusb" ,libusb)
|
||||||
|
;; ("fuse" ,fuse)
|
||||||
("ncurses" ,ncurses)))
|
("ncurses" ,ncurses)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("unifont" ,unifont)
|
`(("unifont" ,unifont)
|
||||||
("bison" ,bison)
|
("bison" ,bison)
|
||||||
("flex" ,flex)
|
("flex" ,flex)
|
||||||
|
("texinfo" ,texinfo)
|
||||||
|
("help2man" ,help2man)
|
||||||
|
|
||||||
;; Dependencies for the test suite. The "real" QEMU is needed here,
|
;; Dependencies for the test suite. The "real" QEMU is needed here,
|
||||||
;; because several targets are used.
|
;; because several targets are used.
|
||||||
|
|
|
||||||
|
|
@ -83,20 +83,20 @@ arrays of data.")
|
||||||
(define-public gstreamer
|
(define-public gstreamer
|
||||||
(package
|
(package
|
||||||
(name "gstreamer")
|
(name "gstreamer")
|
||||||
(version "1.4.5")
|
(version "1.6.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-"
|
(uri (string-append
|
||||||
version ".tar.xz"))
|
"http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-"
|
||||||
|
version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1bmhbhak6i5wmmb6w86jyyv8lax4gdq983la4lk4a0krz6kim020"))))
|
"172w1bpnkn6mm1wi37n03apdbb6cdkykhzjf1vfxchcd7hhkyflp"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(outputs '("out" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:make-flags '("CC=gcc") ; for g-ir-scanner.
|
`(#:configure-flags
|
||||||
#:configure-flags
|
|
||||||
(list (string-append "--with-html-dir="
|
(list (string-append "--with-html-dir="
|
||||||
(assoc-ref %outputs "doc")
|
(assoc-ref %outputs "doc")
|
||||||
"/share/gtk-doc/html"))))
|
"/share/gtk-doc/html"))))
|
||||||
|
|
@ -131,15 +131,15 @@ This package provides the core library and elements.")
|
||||||
(define-public gst-plugins-base
|
(define-public gst-plugins-base
|
||||||
(package
|
(package
|
||||||
(name "gst-plugins-base")
|
(name "gst-plugins-base")
|
||||||
(version "1.4.5")
|
(version "1.6.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-"
|
(uri (string-append "http://gstreamer.freedesktop.org/src/" name "/"
|
||||||
version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"07ampnfa6p41s0lhia62l9h8bdx3c7vxvdz93pbx64m3wycq3gbp"))))
|
"18sbyjcp281zb3bsqji3pglsdsxi0s6ai7rx90sx8cpflkxdqcwm"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(outputs '("out" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
|
|
@ -162,7 +162,8 @@ This package provides the core library and elements.")
|
||||||
("gobject-introspection" ,gobject-introspection)
|
("gobject-introspection" ,gobject-introspection)
|
||||||
("python-wrapper" ,python-wrapper)))
|
("python-wrapper" ,python-wrapper)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags
|
`(#:parallel-tests? #f ; 'pipelines/tcp' fails in parallel
|
||||||
|
#:configure-flags
|
||||||
(list (string-append "--with-html-dir="
|
(list (string-append "--with-html-dir="
|
||||||
(assoc-ref %outputs "doc")
|
(assoc-ref %outputs "doc")
|
||||||
"/share/gtk-doc/html"))
|
"/share/gtk-doc/html"))
|
||||||
|
|
@ -171,9 +172,7 @@ This package provides the core library and elements.")
|
||||||
'configure 'patch
|
'configure 'patch
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "tests/check/libs/pbutils.c"
|
(substitute* "tests/check/libs/pbutils.c"
|
||||||
(("/bin/sh") (which "sh")))
|
(("/bin/sh") (which "sh"))))
|
||||||
;; for g-ir-scanner.
|
|
||||||
(setenv "CC" "gcc"))
|
|
||||||
%standard-phases)))
|
%standard-phases)))
|
||||||
(home-page "http://gstreamer.freedesktop.org/")
|
(home-page "http://gstreamer.freedesktop.org/")
|
||||||
(synopsis
|
(synopsis
|
||||||
|
|
@ -186,7 +185,7 @@ for the GStreamer multimedia library.")
|
||||||
(define-public gst-plugins-good
|
(define-public gst-plugins-good
|
||||||
(package
|
(package
|
||||||
(name "gst-plugins-good")
|
(name "gst-plugins-good")
|
||||||
(version "1.4.5")
|
(version "1.6.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -195,7 +194,7 @@ for the GStreamer multimedia library.")
|
||||||
version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0hg6qzdpib9nwn3hdxv0d4rvivi1c4bmxsq2a9hqmamwyzrvbcbr"))))
|
"0darc3058kbnql3mnlpizl0sq0hhli7vkm0rpqb7nywz14abim46"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("aalib" ,aalib)
|
`(("aalib" ,aalib)
|
||||||
|
|
@ -229,7 +228,7 @@ for the GStreamer multimedia library.")
|
||||||
'unpack 'disable-failing-rtprtx-tests
|
'unpack 'disable-failing-rtprtx-tests
|
||||||
(lambda _
|
(lambda _
|
||||||
;; Disable rtprtx tests that frequently fail.
|
;; Disable rtprtx tests that frequently fail.
|
||||||
;; XXX FIXME: Try removing this for version > 1.4.5.
|
;; XXX FIXME: Try removing this for version > 1.6.1.
|
||||||
(substitute* "tests/check/elements/rtprtx.c"
|
(substitute* "tests/check/elements/rtprtx.c"
|
||||||
(("tcase_add_test \\(tc_chain,\
|
(("tcase_add_test \\(tc_chain,\
|
||||||
(test_rtxsender_max_size_packets|test_rtxreceive_data_reconstruction)\\);" all)
|
(test_rtxsender_max_size_packets|test_rtxreceive_data_reconstruction)\\);" all)
|
||||||
|
|
@ -246,7 +245,7 @@ developers consider to have good quality code and correct functionality.")
|
||||||
(define-public gst-plugins-ugly
|
(define-public gst-plugins-ugly
|
||||||
(package
|
(package
|
||||||
(name "gst-plugins-ugly")
|
(name "gst-plugins-ugly")
|
||||||
(version "1.4.5")
|
(version "1.6.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -254,7 +253,7 @@ developers consider to have good quality code and correct functionality.")
|
||||||
name "/" name "-" version ".tar.xz"))
|
name "/" name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0rwhljn3f8mp2pfchzfcx4pvps1546dndw9mr56lz50qyqffimaw"))))
|
"0mvasl1pwq70w2kmrkcrg77kggl5q7jqybi7fkvy3vr28c7gkhqc"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("gst-plugins-base" ,gst-plugins-base)
|
`(("gst-plugins-base" ,gst-plugins-base)
|
||||||
|
|
@ -284,7 +283,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
|
||||||
(define-public gst-libav
|
(define-public gst-libav
|
||||||
(package
|
(package
|
||||||
(name "gst-libav")
|
(name "gst-libav")
|
||||||
(version "1.4.5")
|
(version "1.6.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -292,7 +291,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1g7vg9amh3cc3nmc415h6g2rqxqi4wgwqi08hxfbpwq48ri64p30"))))
|
"1a9pc7zp5rg0cvpx8gqkr21w73i6p9xa505a34day9f8p3lfim94"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:configure-flags '("--with-system-libav")
|
'(#:configure-flags '("--with-system-libav")
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@
|
||||||
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||||
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||||
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
|
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
|
||||||
|
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -60,7 +61,7 @@
|
||||||
(define-public atk
|
(define-public atk
|
||||||
(package
|
(package
|
||||||
(name "atk")
|
(name "atk")
|
||||||
(version "2.16.0")
|
(version "2.18.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
|
|
@ -68,7 +69,7 @@
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0qp5i91kfk6rhrlam3s8ha0cz88lkyp89vsyn4pb5856c1h9hpq9"))))
|
"0ay9s137x49f0akx658p7kznz0rdapfrd8ym54q0hlgrggblhv6f"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(outputs '("out" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(arguments
|
(arguments
|
||||||
|
|
@ -144,7 +145,7 @@ affine transformation (scale, rotation, shear, etc.).")
|
||||||
(define-public harfbuzz
|
(define-public harfbuzz
|
||||||
(package
|
(package
|
||||||
(name "harfbuzz")
|
(name "harfbuzz")
|
||||||
(version "1.0.3")
|
(version "1.0.5")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://www.freedesktop.org/software/"
|
(uri (string-append "http://www.freedesktop.org/software/"
|
||||||
|
|
@ -152,7 +153,7 @@ affine transformation (scale, rotation, shear, etc.).")
|
||||||
version ".tar.bz2"))
|
version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1xrxlrvgyr6mm9qjxmkif2kvcah082y94gf1vqi0f0bdl1g8gp7b"))))
|
"0h2l362qzkck5dnnj7zlz593hf1ni3k25dfaii9mbjwflp3d56ad"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(outputs '("out"
|
(outputs '("out"
|
||||||
"bin")) ; 160K, only hb-view depend on cairo
|
"bin")) ; 160K, only hb-view depend on cairo
|
||||||
|
|
@ -182,7 +183,7 @@ affine transformation (scale, rotation, shear, etc.).")
|
||||||
(define-public pango
|
(define-public pango
|
||||||
(package
|
(package
|
||||||
(name "pango")
|
(name "pango")
|
||||||
(version "1.36.8")
|
(version "1.38.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/pango/"
|
(uri (string-append "mirror://gnome/sources/pango/"
|
||||||
|
|
@ -190,7 +191,7 @@ affine transformation (scale, rotation, shear, etc.).")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"01rdzjh68w8l5zn0648yibyarj8p6g7yfn59nw5awaz1i8dvbnqq"))))
|
"1dsf45m51i4rcyvh5wlxxrjfhvn5b67d5ckjc6vdcxbddjgmc80k"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("cairo" ,cairo)
|
`(("cairo" ,cairo)
|
||||||
|
|
@ -253,8 +254,10 @@ functions which were removed.")
|
||||||
(build-system waf-build-system)
|
(build-system waf-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases (alist-cons-before
|
`(#:phases (alist-cons-before
|
||||||
'configure 'set-ldflags
|
'configure 'set-flags
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
;; Compile with C++11, required by gtkmm.
|
||||||
|
(setenv "CXXFLAGS" "-std=c++11")
|
||||||
;; Allow 'bin/ganv_bench' to find libganv-1.so.
|
;; Allow 'bin/ganv_bench' to find libganv-1.so.
|
||||||
(setenv "LDFLAGS"
|
(setenv "LDFLAGS"
|
||||||
(string-append "-Wl,-rpath="
|
(string-append "-Wl,-rpath="
|
||||||
|
|
@ -275,7 +278,7 @@ graph-like environments, e.g. modular synths or finite state machine
|
||||||
diagrams.")
|
diagrams.")
|
||||||
(license license:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
(define-public gtksourceview
|
(define-public gtksourceview-2
|
||||||
(package
|
(package
|
||||||
(name "gtksourceview")
|
(name "gtksourceview")
|
||||||
(version "2.10.5") ; This is the last version which builds against gtk+2
|
(version "2.10.5") ; This is the last version which builds against gtk+2
|
||||||
|
|
@ -290,7 +293,6 @@ diagrams.")
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("gtk" ,gtk+-2)
|
`(("gtk" ,gtk+-2)
|
||||||
("libxml2" ,libxml2)
|
|
||||||
;; These two are needed only to allow the tests to run successfully.
|
;; These two are needed only to allow the tests to run successfully.
|
||||||
("xorg-server" ,xorg-server)
|
("xorg-server" ,xorg-server)
|
||||||
("shared-mime-info" ,shared-mime-info)))
|
("shared-mime-info" ,shared-mime-info)))
|
||||||
|
|
@ -298,6 +300,9 @@ diagrams.")
|
||||||
`(("intltool" ,intltool)
|
`(("intltool" ,intltool)
|
||||||
("glib" ,glib "bin") ; for glib-genmarshal, etc.
|
("glib" ,glib "bin") ; for glib-genmarshal, etc.
|
||||||
("pkg-config" ,pkg-config)))
|
("pkg-config" ,pkg-config)))
|
||||||
|
(propagated-inputs
|
||||||
|
;; As per the pkg-config file.
|
||||||
|
`(("libxml2" ,libxml2)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:phases
|
||||||
;; Unfortunately, some of the tests in "make check" are highly dependent
|
;; Unfortunately, some of the tests in "make check" are highly dependent
|
||||||
|
|
@ -329,6 +334,54 @@ printing and other features typical of a source code editor.")
|
||||||
(license license:lgpl2.0+)
|
(license license:lgpl2.0+)
|
||||||
(home-page "https://developer.gnome.org/gtksourceview/")))
|
(home-page "https://developer.gnome.org/gtksourceview/")))
|
||||||
|
|
||||||
|
(define-public gtksourceview
|
||||||
|
(package
|
||||||
|
(name "gtksourceview")
|
||||||
|
(version "3.18.1")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
|
(version-major+minor version) "/"
|
||||||
|
name "-" version ".tar.xz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1rpdg8rcjlqv8yk13vsh5148mads0zbfih8cak3hm7wb0spmzsbv"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
'(#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(add-before
|
||||||
|
'check 'pre-check
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(let ((xorg-server (assoc-ref inputs "xorg-server")))
|
||||||
|
;; Tests require a running X server.
|
||||||
|
(system (format #f "~a/bin/Xvfb :1 &" xorg-server))
|
||||||
|
(setenv "DISPLAY" ":1")
|
||||||
|
;; For the missing /etc/machine-id.
|
||||||
|
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||||
|
#t))))))
|
||||||
|
(native-inputs
|
||||||
|
`(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc.
|
||||||
|
("intltool" ,intltool)
|
||||||
|
("itstool", itstool)
|
||||||
|
("gobject-introspection" ,gobject-introspection)
|
||||||
|
("pkg-config" ,pkg-config)
|
||||||
|
("vala" ,vala)
|
||||||
|
;; For testing.
|
||||||
|
("xorg-server" ,xorg-server)
|
||||||
|
("shared-mime-info" ,shared-mime-info)))
|
||||||
|
(propagated-inputs
|
||||||
|
;; gtksourceview-3.0.pc refers to all these.
|
||||||
|
`(("glib" ,glib)
|
||||||
|
("gtk+" ,gtk+)
|
||||||
|
("libxml2" ,libxml2)))
|
||||||
|
(home-page "https://wiki.gnome.org/Projects/GtkSourceView")
|
||||||
|
(synopsis "GNOME source code widget")
|
||||||
|
(description "GtkSourceView is a text widget that extends the standard
|
||||||
|
GTK+ text widget GtkTextView. It improves GtkTextView by implementing syntax
|
||||||
|
highlighting and other features typical of a source code editor.")
|
||||||
|
(license license:lgpl2.1+)))
|
||||||
|
|
||||||
(define-public gdk-pixbuf
|
(define-public gdk-pixbuf
|
||||||
(package
|
(package
|
||||||
(name "gdk-pixbuf")
|
(name "gdk-pixbuf")
|
||||||
|
|
@ -381,7 +434,7 @@ in the GNOME project.")
|
||||||
(define-public at-spi2-core
|
(define-public at-spi2-core
|
||||||
(package
|
(package
|
||||||
(name "at-spi2-core")
|
(name "at-spi2-core")
|
||||||
(version "2.16.0")
|
(version "2.18.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
|
|
@ -389,7 +442,7 @@ in the GNOME project.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1l3l39mw23zyjlcqidvkyqlr4gwbhplzw2hcv3qvn6p8ikxpf2qw"))))
|
"1kq17w4fm51d49vzmglkxqdm6s0yvjvrpgw78r2hajf69jz5bmap"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(outputs '("out" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(arguments
|
(arguments
|
||||||
|
|
@ -402,6 +455,8 @@ in the GNOME project.")
|
||||||
(replace 'check
|
(replace 'check
|
||||||
;; Run test-suite under a dbus session.
|
;; Run test-suite under a dbus session.
|
||||||
(lambda _
|
(lambda _
|
||||||
|
;; Don't fail on missing '/etc/machine-id'.
|
||||||
|
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||||
(zero? (system* "dbus-launch" "make" "check")))))))
|
(zero? (system* "dbus-launch" "make" "check")))))))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
;; atspi-2.pc refers to all these.
|
;; atspi-2.pc refers to all these.
|
||||||
|
|
@ -424,7 +479,7 @@ is part of the GNOME accessibility project.")
|
||||||
(define-public at-spi2-atk
|
(define-public at-spi2-atk
|
||||||
(package
|
(package
|
||||||
(name "at-spi2-atk")
|
(name "at-spi2-atk")
|
||||||
(version "2.16.0")
|
(version "2.18.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
|
|
@ -432,7 +487,7 @@ is part of the GNOME accessibility project.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1y9gfz1iz3wpja7s000f0bmyyvc6im5fcdl6bxwbz0v3qdgc9vvq"))))
|
"0bf1g5cj84rmx7p1q547vwbc0hlpcs2wrxnmv96lckfkhs9mzcf4"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:phases
|
'(#:phases
|
||||||
|
|
@ -440,6 +495,7 @@ is part of the GNOME accessibility project.")
|
||||||
(replace 'check
|
(replace 'check
|
||||||
;; Run test-suite under a dbus session.
|
;; Run test-suite under a dbus session.
|
||||||
(lambda _
|
(lambda _
|
||||||
|
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||||
(zero? (system* "dbus-launch" "make" "check")))))))
|
(zero? (system* "dbus-launch" "make" "check")))))))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc
|
`(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc
|
||||||
|
|
@ -514,7 +570,7 @@ application suites.")
|
||||||
(define-public gtk+
|
(define-public gtk+
|
||||||
(package (inherit gtk+-2)
|
(package (inherit gtk+-2)
|
||||||
(name "gtk+")
|
(name "gtk+")
|
||||||
(version "3.16.6")
|
(version "3.18.2")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
|
|
@ -522,12 +578,13 @@ application suites.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1gpzlnfrifc17yfk0zki6b2vmsfpf5cmrbh232s6iaan11np44jd"))))
|
"0lp1hn0qydxx03bianzzr0a4maqzsvylrkzr7c3p0050qihwbgjx"))))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("at-spi2-atk" ,at-spi2-atk)
|
`(("at-spi2-atk" ,at-spi2-atk)
|
||||||
("atk" ,atk)
|
("atk" ,atk)
|
||||||
("gdk-pixbuf" ,gdk-pixbuf)
|
("gdk-pixbuf" ,gdk-pixbuf)
|
||||||
("libepoxy" ,libepoxy)
|
("libepoxy" ,libepoxy)
|
||||||
|
("libxcursor" ,libxcursor)
|
||||||
("libxi" ,libxi)
|
("libxi" ,libxi)
|
||||||
("libxinerama" ,libxinerama)
|
("libxinerama" ,libxinerama)
|
||||||
("libxdamage" ,libxdamage)
|
("libxdamage" ,libxdamage)
|
||||||
|
|
@ -535,7 +592,13 @@ application suites.")
|
||||||
(inputs
|
(inputs
|
||||||
`(("librsvg" ,librsvg) ;for gtk-encode-symbolic-svg
|
`(("librsvg" ,librsvg) ;for gtk-encode-symbolic-svg
|
||||||
("libxml2" ,libxml2)
|
("libxml2" ,libxml2)
|
||||||
("cups" ,cups))) ;for printing support
|
;; XXX: colord depends on mozjs (through polkit), which fails on
|
||||||
|
;; on non-intel systems now.
|
||||||
|
;;("colord" ,colord)
|
||||||
|
("cups" ,cups) ;for printing support
|
||||||
|
;; XXX: rest depends on p11-kit, which fails on mips64el now.
|
||||||
|
;;("rest" ,rest)
|
||||||
|
("json-glib" ,json-glib)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("perl" ,perl)
|
`(("perl" ,perl)
|
||||||
("glib" ,glib "bin")
|
("glib" ,glib "bin")
|
||||||
|
|
@ -731,14 +794,15 @@ documents.")
|
||||||
(define-public cairomm
|
(define-public cairomm
|
||||||
(package
|
(package
|
||||||
(name "cairomm")
|
(name "cairomm")
|
||||||
(version "1.11.2")
|
(version "1.12.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://cairographics.org/releases/cairomm-"
|
(uri (string-append "mirror://gnome/sources/cairomm/"
|
||||||
version ".tar.gz"))
|
(version-major+minor version) "/"
|
||||||
(sha256
|
name "-" version ".tar.xz"))
|
||||||
(base32
|
(sha256
|
||||||
"138052ybc58q5yl92m2p0br0k0a9g1pi9gfhmn4y220yih4pgxnc"))))
|
(base32
|
||||||
|
"1rmgs6zjj2vaxh9hsa0944m23fdn1psycqh7bi984qd8jj1xljm5"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
;; The examples lack -lcairo.
|
;; The examples lack -lcairo.
|
||||||
|
|
@ -759,7 +823,7 @@ library.")
|
||||||
(define-public pangomm
|
(define-public pangomm
|
||||||
(package
|
(package
|
||||||
(name "pangomm")
|
(name "pangomm")
|
||||||
(version "2.36.0")
|
(version "2.38.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
|
|
@ -767,7 +831,7 @@ library.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1w11d05nkxglzg67rfa81vqghm75xhy6j396xmmp5mq8qx96knd8"))))
|
"12xwjvqfxhqblcv7641k0l6r8n3qifnrx8w9571izn1nbd81iyzg"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
|
|
@ -785,7 +849,7 @@ library.")
|
||||||
(define-public atkmm
|
(define-public atkmm
|
||||||
(package
|
(package
|
||||||
(name "atkmm")
|
(name "atkmm")
|
||||||
(version "2.22.7")
|
(version "2.24.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
|
|
@ -793,7 +857,7 @@ library.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"06zrf2ymml2dzp53sss0d4ch4dk9v09jm8rglnrmwk4v81mq9gxz"))))
|
"08zd6s5c1q90wm8310mdrb5f2lj8v63wxihrybwyw13xlf6ivi16"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
|
|
@ -808,7 +872,7 @@ toolkit.")
|
||||||
(define-public gtkmm
|
(define-public gtkmm
|
||||||
(package
|
(package
|
||||||
(name "gtkmm")
|
(name "gtkmm")
|
||||||
(version "3.16.0")
|
(version "3.18.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
|
|
@ -816,9 +880,10 @@ toolkit.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv"))))
|
"0sxq700invkjpksn790gbnl8px8751kvgwn39663jx7dv89s37w2"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
(native-inputs `(("pkg-config" ,pkg-config)
|
||||||
|
("glib" ,glib "bin"))) ;for 'glib-compile-resources'
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("pangomm" ,pangomm)
|
`(("pangomm" ,pangomm)
|
||||||
("cairomm" ,cairomm)
|
("cairomm" ,cairomm)
|
||||||
|
|
@ -849,6 +914,9 @@ extensive documentation, including API reference and a tutorial.")
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4"))))
|
"1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4"))))
|
||||||
|
(arguments
|
||||||
|
'(#:configure-flags '("CPPFLAGS=-std=c++11"))) ; required by libsigc++
|
||||||
|
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("pangomm" ,pangomm)
|
`(("pangomm" ,pangomm)
|
||||||
("cairomm" ,cairomm)
|
("cairomm" ,cairomm)
|
||||||
|
|
@ -1040,7 +1108,7 @@ information.")
|
||||||
(home-page "http://www.gtk.org/gtk-doc/")
|
(home-page "http://www.gtk.org/gtk-doc/")
|
||||||
(synopsis "Documentation generator from C source code")
|
(synopsis "Documentation generator from C source code")
|
||||||
(description
|
(description
|
||||||
"GTK-Doc generates API documentation from comments added to C code. It is
|
"GTK-Doc generates API documentation from comments added to C code. It is
|
||||||
typically used to document the public API of GTK+ and GNOME libraries, but it
|
typically used to document the public API of GTK+ and GNOME libraries, but it
|
||||||
can also be used to document application code.")
|
can also be used to document application code.")
|
||||||
(license license:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,7 @@
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages autotools)
|
||||||
#:use-module (gnu packages flex)
|
#:use-module (gnu packages flex)
|
||||||
#:use-module (gnu packages libunistring)
|
#:use-module (gnu packages libunistring)
|
||||||
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages m4)
|
#:use-module (gnu packages m4)
|
||||||
#:use-module (gnu packages multiprecision)
|
#:use-module (gnu packages multiprecision)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
|
|
@ -38,8 +39,12 @@
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages texinfo)
|
#:use-module (gnu packages texinfo)
|
||||||
#:use-module (gnu packages gettext)
|
#:use-module (gnu packages gettext)
|
||||||
#:use-module (gnu packages gdbm)
|
#:use-module (gnu packages databases)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
|
#:use-module (gnu packages gl)
|
||||||
|
#:use-module (gnu packages sdl)
|
||||||
|
#:use-module (gnu packages maths)
|
||||||
|
#:use-module (gnu packages image)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix git-download)
|
#:use-module (guix git-download)
|
||||||
|
|
@ -189,40 +194,15 @@ without requiring the source code to be rewritten.")
|
||||||
(define-public guile-next
|
(define-public guile-next
|
||||||
(package (inherit guile-2.0)
|
(package (inherit guile-2.0)
|
||||||
(name "guile-next")
|
(name "guile-next")
|
||||||
(version "20150815.00884bb")
|
(version "2.1.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method url-fetch)
|
||||||
(uri (git-reference
|
(uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-"
|
||||||
(url "git://git.sv.gnu.org/guile.git")
|
version ".tar.xz"))
|
||||||
(commit "00884bb79fff41fdf5f22f24a74e366a94a14c9b")))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0qk8m9aq3i7pzw6npim58xmsvjqfz5kl1pkyb6b43awn2vydydi5"))))
|
"0nixmx7as79g8rr8bvznh59pwcc2jd22cfk17v309p57zp2c255r"))))
|
||||||
|
(synopsis "Snapshot of what will become version 2.2 of GNU Guile")))
|
||||||
(arguments
|
|
||||||
(substitute-keyword-arguments `(;; Tests aren't passing for now.
|
|
||||||
;; Obviously we should re-enable this!
|
|
||||||
#:tests? #f
|
|
||||||
,@(package-arguments guile-2.0))
|
|
||||||
((#:phases phases)
|
|
||||||
`(modify-phases ,phases
|
|
||||||
(add-after 'unpack 'autogen
|
|
||||||
(lambda _
|
|
||||||
(zero? (system* "sh" "autogen.sh"))))
|
|
||||||
(add-before 'autogen 'patch-/bin/sh
|
|
||||||
(lambda _
|
|
||||||
(substitute* "build-aux/git-version-gen"
|
|
||||||
(("#!/bin/sh") (string-append "#!" (which "sh"))))
|
|
||||||
#t))))))
|
|
||||||
(synopsis "Snapshot of what will become version 2.2 of GNU Guile")
|
|
||||||
(native-inputs
|
|
||||||
`(("autoconf" ,autoconf)
|
|
||||||
("automake" ,automake)
|
|
||||||
("libtool" ,libtool)
|
|
||||||
("flex" ,flex)
|
|
||||||
("texinfo" ,texinfo)
|
|
||||||
("gettext" ,gnu-gettext)
|
|
||||||
,@(package-native-inputs guile-2.0)))))
|
|
||||||
|
|
||||||
(define-public guile-for-guile-emacs
|
(define-public guile-for-guile-emacs
|
||||||
(package (inherit guile-next)
|
(package (inherit guile-next)
|
||||||
|
|
@ -235,13 +215,86 @@ without requiring the source code to be rewritten.")
|
||||||
(commit "d8d9a8da05ec876acba81a559798eb5eeceb5a17")))
|
(commit "d8d9a8da05ec876acba81a559798eb5eeceb5a17")))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"00sprsshy16y8pxjy126hr2adqcvvzzz96hjyjwgg8swva1qh6b0"))))))
|
"00sprsshy16y8pxjy126hr2adqcvvzzz96hjyjwgg8swva1qh6b0"))))
|
||||||
|
(arguments
|
||||||
|
(substitute-keyword-arguments `(;; Tests aren't passing for now.
|
||||||
|
;; Obviously we should re-enable this!
|
||||||
|
#:tests? #f
|
||||||
|
,@(package-arguments guile-next))
|
||||||
|
((#:phases phases)
|
||||||
|
`(modify-phases ,phases
|
||||||
|
(add-after 'unpack 'autogen
|
||||||
|
(lambda _
|
||||||
|
(zero? (system* "sh" "autogen.sh"))))
|
||||||
|
(add-before 'autogen 'patch-/bin/sh
|
||||||
|
(lambda _
|
||||||
|
(substitute* "build-aux/git-version-gen"
|
||||||
|
(("#!/bin/sh") (string-append "#!" (which "sh"))))
|
||||||
|
#t))))))
|
||||||
|
(native-inputs
|
||||||
|
`(("autoconf" ,autoconf)
|
||||||
|
("automake" ,automake)
|
||||||
|
("libtool" ,libtool)
|
||||||
|
("flex" ,flex)
|
||||||
|
("texinfo" ,texinfo)
|
||||||
|
("gettext" ,gnu-gettext)
|
||||||
|
,@(package-native-inputs guile-next)))))
|
||||||
|
|
||||||
|
|
||||||
;;;
|
;;;
|
||||||
;;; Extensions.
|
;;; Extensions.
|
||||||
;;;
|
;;;
|
||||||
|
|
||||||
|
(define-public artanis
|
||||||
|
(package
|
||||||
|
(name "artanis")
|
||||||
|
(version "0.1.0")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "ftp://alpha.gnu.org/gnu/artanis/artanis-"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1mc2zy6n9wnn4hzi3zp3jd6b5rlr0lv7fvh800xf4fyrxg0zia4g"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
;; TODO: Add guile-dbi and guile-dbd optional dependencies.
|
||||||
|
(inputs `(("guile" ,guile-2.0)))
|
||||||
|
(native-inputs `(("bash" ,bash) ;for the `source' builtin
|
||||||
|
("pkgconfig" ,pkg-config)
|
||||||
|
("util-linux" ,util-linux))) ;for the `script' command
|
||||||
|
(arguments
|
||||||
|
'(#:make-flags
|
||||||
|
;; TODO: The documentation must be built with the `docs' target.
|
||||||
|
(let* ((out (assoc-ref %outputs "out"))
|
||||||
|
(dir (string-append out "/share/guile/site/2.0")))
|
||||||
|
;; Don't use (%site-dir) for site paths.
|
||||||
|
(list (string-append "MOD_PATH=" dir)
|
||||||
|
(string-append "MOD_COMPILED_PATH=" dir)))
|
||||||
|
#:test-target "test"
|
||||||
|
#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(add-before
|
||||||
|
'install 'substitute-root-dir
|
||||||
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
(let ((out (assoc-ref outputs "out")))
|
||||||
|
(substitute* "Makefile" ;ignore the execution of bash.bashrc
|
||||||
|
((" /etc/bash.bashrc") " /dev/null"))
|
||||||
|
(substitute* "Makefile" ;set the root of config files to OUT
|
||||||
|
((" /etc") (string-append " " out "/etc")))
|
||||||
|
(mkdir-p (string-append out "/bin")) ;for the `art' executable
|
||||||
|
#t))))))
|
||||||
|
(synopsis "Web application framework written in Guile")
|
||||||
|
(description "GNU Artanis is a web application framework written in Guile
|
||||||
|
Scheme. A web application framework (WAF) is a software framework that is
|
||||||
|
designed to support the development of dynamic websites, web applications, web
|
||||||
|
services and web resources. The framework aims to alleviate the overhead
|
||||||
|
associated with common activities performed in web development. Artanis
|
||||||
|
provides several tools for web development: database access, templating
|
||||||
|
frameworks, session management, URL-remapping for RESTful, page caching, and
|
||||||
|
more.")
|
||||||
|
(home-page "https://www.gnu.org/software/artanis/")
|
||||||
|
(license (list gpl3+ lgpl3+)))) ;dual license
|
||||||
|
|
||||||
(define-public guile-reader
|
(define-public guile-reader
|
||||||
(package
|
(package
|
||||||
(name "guile-reader")
|
(name "guile-reader")
|
||||||
|
|
@ -296,6 +349,10 @@ many readers as needed).")
|
||||||
(string-append "--with-guilesitedir="
|
(string-append "--with-guilesitedir="
|
||||||
(assoc-ref %outputs "out")
|
(assoc-ref %outputs "out")
|
||||||
"/share/guile/site/2.0"))
|
"/share/guile/site/2.0"))
|
||||||
|
|
||||||
|
;; Work around <http://bugs.gnu.org/21677>.
|
||||||
|
#:make-flags '("XFAIL_TESTS=curses_034_util.test")
|
||||||
|
|
||||||
#:phases (alist-cons-after
|
#:phases (alist-cons-after
|
||||||
'install 'post-install
|
'install 'post-install
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
|
@ -412,6 +469,7 @@ http:://json.org specification. These are the main features:
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "https://github.com/ijp/minikanren.git")
|
(url "https://github.com/ijp/minikanren.git")
|
||||||
(commit "e844d85512f8c055d3f96143ee506007389a25e3")))
|
(commit "e844d85512f8c055d3f96143ee506007389a25e3")))
|
||||||
|
(file-name (string-append name "-" version "-checkout"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0r50jlpzi940jlmxyy3ddqqwmj5r12gb4bcv0ssini9v8km13xz6"))))
|
"0r50jlpzi940jlmxyy3ddqqwmj5r12gb4bcv0ssini9v8km13xz6"))))
|
||||||
|
|
@ -478,6 +536,84 @@ slightly from miniKanren mainline.
|
||||||
See http://minikanren.org/ for more on miniKanren generally.")
|
See http://minikanren.org/ for more on miniKanren generally.")
|
||||||
(license expat)))
|
(license expat)))
|
||||||
|
|
||||||
|
(define-public guile-irregex
|
||||||
|
(package
|
||||||
|
(name "guile-irregex")
|
||||||
|
(version "0.9.3")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"http://synthcode.com/scheme/irregex/irregex-"
|
||||||
|
version
|
||||||
|
".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1b8jl7bycyl2ssp6sb1j24pp9hvqyxm85ki9bmwd50glyyjs5zay"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
`(#:modules ((guix build utils)
|
||||||
|
(ice-9 match)
|
||||||
|
(guix build gnu-build-system))
|
||||||
|
#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(delete 'configure)
|
||||||
|
(delete 'build)
|
||||||
|
(delete 'check)
|
||||||
|
(replace 'install
|
||||||
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
|
(begin
|
||||||
|
(use-modules (guix build utils)
|
||||||
|
(ice-9 match))
|
||||||
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
|
(module-dir (string-append out "/share/guile/site/2.0"))
|
||||||
|
(source (assoc-ref inputs "source"))
|
||||||
|
(doc (string-append out "/share/doc/guile-irregex/"))
|
||||||
|
(guild (string-append (assoc-ref %build-inputs "guile")
|
||||||
|
"/bin/guild")))
|
||||||
|
;; Make installation directories.
|
||||||
|
(mkdir-p (string-append module-dir "/rx/source"))
|
||||||
|
(mkdir-p doc)
|
||||||
|
|
||||||
|
;; Compile .scm files and install.
|
||||||
|
(setenv "GUILE_AUTO_COMPILE" "0")
|
||||||
|
|
||||||
|
(for-each (lambda (copy-info)
|
||||||
|
(match copy-info
|
||||||
|
((src-file dest-file-basis)
|
||||||
|
(let* ((dest-file (string-append
|
||||||
|
module-dir dest-file-basis
|
||||||
|
".scm"))
|
||||||
|
(go-file (string-append
|
||||||
|
module-dir dest-file-basis
|
||||||
|
".go")))
|
||||||
|
;; Install source module.
|
||||||
|
(copy-file src-file
|
||||||
|
dest-file)
|
||||||
|
;; Install compiled module.
|
||||||
|
(unless (zero? (system* guild "compile"
|
||||||
|
"-L" (getcwd)
|
||||||
|
"-o" go-file
|
||||||
|
src-file))
|
||||||
|
(error (format #f "Failed to compile ~s to ~s!"
|
||||||
|
src-file dest-file)))))))
|
||||||
|
'(("irregex-guile.scm" "/rx/irregex")
|
||||||
|
("irregex.scm" "/rx/source/irregex")
|
||||||
|
;; Not really reachable via guile's packaging system,
|
||||||
|
;; but nice to have around
|
||||||
|
("irregex-utils.scm" "/rx/source/irregex-utils")))
|
||||||
|
|
||||||
|
;; Also copy over the README.
|
||||||
|
(install-file "irregex.html" doc)
|
||||||
|
#t)))))))
|
||||||
|
(inputs
|
||||||
|
`(("guile" ,guile-2.0)))
|
||||||
|
(home-page "http://synthcode.com/scheme/irregex")
|
||||||
|
(synopsis "S-expression based regular expressions")
|
||||||
|
(description
|
||||||
|
"Irregex is an s-expression based alternative to your classic
|
||||||
|
string-based regular expressions. It implements SRFI 115 and is deeply
|
||||||
|
inspired by the SCSH regular expression system.")
|
||||||
|
(license bsd-3)))
|
||||||
|
|
||||||
;; There are two guile-gdbm packages, one using the FFI and one with
|
;; There are two guile-gdbm packages, one using the FFI and one with
|
||||||
;; direct C bindings, hence the verbose name.
|
;; direct C bindings, hence the verbose name.
|
||||||
|
|
@ -491,6 +627,7 @@ See http://minikanren.org/ for more on miniKanren generally.")
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "https://github.com/ijp/guile-gdbm.git")
|
(url "https://github.com/ijp/guile-gdbm.git")
|
||||||
(commit "fa1d5b6231d0e4d096687b378c025f2148c5f246")))
|
(commit "fa1d5b6231d0e4d096687b378c025f2148c5f246")))
|
||||||
|
(file-name (string-append name "-" version "-checkout"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1j8wrsw7v9w6qkl47xz0rdikg50v16nn6kbs3lgzcymjzpa7babj"))))
|
"1j8wrsw7v9w6qkl47xz0rdikg50v16nn6kbs3lgzcymjzpa7babj"))))
|
||||||
|
|
@ -663,10 +800,45 @@ key-value cache and store.")
|
||||||
(inputs
|
(inputs
|
||||||
`(("guile" ,guile-2.0)
|
`(("guile" ,guile-2.0)
|
||||||
("python" ,python)))
|
("python" ,python)))
|
||||||
(synopsis "wisp is a whitespace to lisp syntax for Guile")
|
(synopsis "Whitespace to lisp syntax for Guile")
|
||||||
(description "wisp is a syntax for Guile which provides a Python-like
|
(description "Wisp is a syntax for Guile which provides a Python-like
|
||||||
whitespace-significant language. It may be easier on the eyes for some
|
whitespace-significant language. It may be easier on the eyes for some
|
||||||
users and in some situations.")
|
users and in some situations.")
|
||||||
(license gpl3+)))
|
(license gpl3+)))
|
||||||
|
|
||||||
|
(define-public guile-sly
|
||||||
|
(package
|
||||||
|
(name "guile-sly")
|
||||||
|
(version "0.1")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "https://files.dthompson.us/sly/sly-"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1svzlbz2vripmyq2kjh0rig16bsrnbkwbsm558pjln9l65mcl4qq"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
'(#:configure-flags
|
||||||
|
(list (string-append "--with-libfreeimage-prefix="
|
||||||
|
(assoc-ref %build-inputs "freeimage"))
|
||||||
|
(string-append "--with-libgslcblas-prefix="
|
||||||
|
(assoc-ref %build-inputs "gsl")))))
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
(propagated-inputs
|
||||||
|
`(("guile" ,guile-2.0)
|
||||||
|
("guile-sdl" ,guile-sdl)
|
||||||
|
("guile-opengl" ,guile-opengl)))
|
||||||
|
(inputs
|
||||||
|
`(("gsl" ,gsl)
|
||||||
|
("freeimage" ,freeimage)
|
||||||
|
("mesa" ,mesa)))
|
||||||
|
(synopsis "2D/3D game engine for GNU Guile")
|
||||||
|
(description "Sly is a 2D/3D game engine written in Guile Scheme. Sly
|
||||||
|
features a functional reactive programming interface and live coding
|
||||||
|
capabilities.")
|
||||||
|
(home-page "http://dthompson.us/pages/software/sly.html")
|
||||||
|
(license gpl3+)))
|
||||||
|
|
||||||
;;; guile.scm ends here
|
;;; guile.scm ends here
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -32,7 +32,7 @@
|
||||||
(define-public gnumach-headers
|
(define-public gnumach-headers
|
||||||
(package
|
(package
|
||||||
(name "gnumach-headers")
|
(name "gnumach-headers")
|
||||||
(version "1.5")
|
(version "1.6")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -40,7 +40,7 @@
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0wsf57q4h6xl2jn28d423qx7zplmhpnf9ssm4f1c0sf8513xm81j"))))
|
"1m7xwsrv6x6gk9xi5phs104rdn9q3lr63p348vyv0dzd6r3zyncb"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases (alist-replace
|
`(#:phases (alist-replace
|
||||||
|
|
@ -66,7 +66,7 @@
|
||||||
(define-public mig
|
(define-public mig
|
||||||
(package
|
(package
|
||||||
(name "mig")
|
(name "mig")
|
||||||
(version "1.5")
|
(version "1.6")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"13r1pg8icyc0pl082z7k36i440pr1f3nr7ahig3rrc0r7qndqmk9"))))
|
"1i9qd6j5g8wsv9k9n6vpdqflyw0284wyayb2s2h7pp4yyi2jsksk"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
;; Flex is needed both at build and run time.
|
;; Flex is needed both at build and run time.
|
||||||
(inputs `(("gnumach-headers" ,gnumach-headers)
|
(inputs `(("gnumach-headers" ,gnumach-headers)
|
||||||
|
|
@ -97,14 +97,14 @@ communication.")
|
||||||
(define-public hurd-headers
|
(define-public hurd-headers
|
||||||
(package
|
(package
|
||||||
(name "hurd-headers")
|
(name "hurd-headers")
|
||||||
(version "0.6")
|
(version "0.7")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnu/hurd/hurd-"
|
(uri (string-append "mirror://gnu/hurd/hurd-"
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"059lbspbpcjpcq5jf98f47jw9sm0ngs3x6phxax53m3rwca1fk7y"))))
|
"1q2pyc16vb5plqi8hlwnnc9jk8zlifm91cavz6x7vhbwy0nh2yvh"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(;; Autoconf shouldn't be necessary but there seems to be a bug in the
|
`(;; Autoconf shouldn't be necessary but there seems to be a bug in the
|
||||||
|
|
@ -182,6 +182,6 @@ Library and other user programs.")
|
||||||
(home-page "http://www.gnu.org/software/hurd/hurd.html")
|
(home-page "http://www.gnu.org/software/hurd/hurd.html")
|
||||||
(synopsis "GNU Hurd libraries")
|
(synopsis "GNU Hurd libraries")
|
||||||
(description
|
(description
|
||||||
"This package provides libihash, needed to build the GNU C
|
"This package provides libihash, needed to build the GNU C
|
||||||
Library for GNU/Hurd.")
|
Library for GNU/Hurd.")
|
||||||
(license gpl2+)))
|
(license gpl2+)))
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
;;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
|
;;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
|
||||||
;;; Copyright © 2014 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2014 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
||||||
|
;;; Copyright © 2015 Amirouche Boubekki <amirouche@hypermove.net>
|
||||||
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
|
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
|
|
@ -49,7 +50,7 @@
|
||||||
(define-public libpng
|
(define-public libpng
|
||||||
(package
|
(package
|
||||||
(name "libpng")
|
(name "libpng")
|
||||||
(version "1.5.21")
|
(version "1.5.24")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
||||||
|
|
@ -60,7 +61,7 @@
|
||||||
"ftp://ftp.simplesystems.org/pub/libpng/png/src"
|
"ftp://ftp.simplesystems.org/pub/libpng/png/src"
|
||||||
"/libpng15/libpng-" version ".tar.xz")))
|
"/libpng15/libpng-" version ".tar.xz")))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "19yvzw6sf9gf7v25ha9bla8bw1nijh82wj8ag6brjj3hpij1q5dm"))))
|
(base32 "1qhvfk1ypsaf6q6xkspyqqzmghpbahhq54ms8fa5ssqkyds38bmr"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
|
||||||
;; libpng.la says "-lz", so propagate it.
|
;; libpng.la says "-lz", so propagate it.
|
||||||
|
|
@ -104,6 +105,29 @@ image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats.")
|
||||||
(sha256 (base32
|
(sha256 (base32
|
||||||
"1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"))))))
|
"1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"))))))
|
||||||
|
|
||||||
|
(define-public jpegoptim
|
||||||
|
(package
|
||||||
|
(name "jpegoptim")
|
||||||
|
(version "1.4.3")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "http://www.kokkonen.net/tjko/src/jpegoptim-"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(sha256 (base32
|
||||||
|
"0k53q7dc8w5ashz8v261x2b5vvz7gdvg8w962rz9gjvkjbh4lg93"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(inputs `(("libjpeg" ,libjpeg)))
|
||||||
|
(arguments
|
||||||
|
;; no tests
|
||||||
|
'(#:tests? #f))
|
||||||
|
(synopsis "Optimize JPEG images")
|
||||||
|
(description
|
||||||
|
"jpegoptim provides lossless optimization (based on optimizing
|
||||||
|
the Huffman tables) and \"lossy\" optimization based on setting
|
||||||
|
maximum quality factor.")
|
||||||
|
(license license:gpl2+)
|
||||||
|
(home-page "http://www.kokkonen.net/tjko/projects.html#jpegoptim")))
|
||||||
|
|
||||||
(define-public libtiff
|
(define-public libtiff
|
||||||
(package
|
(package
|
||||||
(name "libtiff")
|
(name "libtiff")
|
||||||
|
|
@ -184,14 +208,14 @@ the W3C's XML-based Scaleable Vector Graphic (SVG) format.")
|
||||||
(define-public leptonica
|
(define-public leptonica
|
||||||
(package
|
(package
|
||||||
(name "leptonica")
|
(name "leptonica")
|
||||||
(version "1.71")
|
(version "1.72")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://www.leptonica.com/source/leptonica-"
|
(uri (string-append "http://www.leptonica.com/source/leptonica-"
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0j5qgrff6im5n9waflbi7w643q1p6mahyf2z35gb4vj9h5p76pfc"))
|
(base32 "0mhzvqs0im04y1cpcc1yma70hgdac1frf33h73m9z3356bfymmbr"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
;; zlib and openjpg should be under Libs, not Libs.private. See:
|
;; zlib and openjpg should be under Libs, not Libs.private. See:
|
||||||
;; https://code.google.com/p/tesseract-ocr/issues/detail?id=1436
|
;; https://code.google.com/p/tesseract-ocr/issues/detail?id=1436
|
||||||
|
|
@ -216,7 +240,8 @@ the W3C's XML-based Scaleable Vector Graphic (SVG) format.")
|
||||||
`(("openjpeg" ,openjpeg)
|
`(("openjpeg" ,openjpeg)
|
||||||
("zlib" ,zlib)))
|
("zlib" ,zlib)))
|
||||||
(arguments
|
(arguments
|
||||||
'(#:phases
|
'(#:parallel-tests? #f ; XXX: cause fpix1_reg to fail
|
||||||
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
;; Prevent make from trying to regenerate config.h.in.
|
;; Prevent make from trying to regenerate config.h.in.
|
||||||
(add-after
|
(add-after
|
||||||
|
|
@ -228,7 +253,15 @@ the W3C's XML-based Scaleable Vector Graphic (SVG) format.")
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "prog/reg_wrapper.sh"
|
(substitute* "prog/reg_wrapper.sh"
|
||||||
((" /bin/sh ")
|
((" /bin/sh ")
|
||||||
(string-append " " (which "sh") " "))))))))
|
(string-append " " (which "sh") " "))
|
||||||
|
(("which gnuplot") (which "gnuplot")))))
|
||||||
|
(add-before
|
||||||
|
'check 'disable-failing-tests
|
||||||
|
;; XXX: 2 of 9 tests from webpio_reg fails.
|
||||||
|
(lambda _
|
||||||
|
(substitute* "prog/webpio_reg.c"
|
||||||
|
((".*DoWebpTest2.* 90.*") "")
|
||||||
|
((".*DoWebpTest2.* 100.*") "")))))))
|
||||||
(home-page "http://www.leptonica.com/")
|
(home-page "http://www.leptonica.com/")
|
||||||
(synopsis "Library and tools for image processing and analysis")
|
(synopsis "Library and tools for image processing and analysis")
|
||||||
(description
|
(description
|
||||||
|
|
@ -337,14 +370,14 @@ error-resilience, a Java-viewer for j2k-images, ...")
|
||||||
(define-public giflib
|
(define-public giflib
|
||||||
(package
|
(package
|
||||||
(name "giflib")
|
(name "giflib")
|
||||||
(version "4.2.3")
|
(version "5.1.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://sourceforge/giflib/giflib-"
|
(uri (string-append "mirror://sourceforge/giflib/giflib-"
|
||||||
(first (string-split version #\.))
|
(first (string-split version #\.))
|
||||||
".x/giflib-" version ".tar.bz2"))
|
".x/giflib-" version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0rmp7ipzk42r841bggd7bfqk4p8qsssbp4wcck4qnz7p4rkxbj0a"))))
|
(base32 "1z1gzq16sdya8xnl5qjc07634kkwj5m0n3bvvj4v9j11xfn1841r"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(outputs '("bin" ; utility programs
|
(outputs '("bin" ; utility programs
|
||||||
"out")) ; library
|
"out")) ; library
|
||||||
|
|
@ -618,3 +651,77 @@ channels.")
|
||||||
(description
|
(description
|
||||||
"Libmng is the MNG (Multiple-image Network Graphics) reference library.")
|
"Libmng is the MNG (Multiple-image Network Graphics) reference library.")
|
||||||
(license license:bsd-3)))
|
(license license:bsd-3)))
|
||||||
|
|
||||||
|
(define-public devil
|
||||||
|
(package
|
||||||
|
(name "devil")
|
||||||
|
(version "1.7.8")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "http://downloads.sourceforge.net/openil/"
|
||||||
|
"DevIL-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"))
|
||||||
|
;; Backported from upstream:
|
||||||
|
;; https://github.com/DentonW/DevIL/commit/724194d7a9a91221a564579f64bdd6f0abd64219.patch
|
||||||
|
(patches (list (search-patch "devil-fix-libpng.patch")))
|
||||||
|
(modules '((guix build utils)))
|
||||||
|
(snippet
|
||||||
|
;; Fix old lcms include directives and lib flags.
|
||||||
|
'(substitute* '("configure" "src-IL/src/il_profiles.c")
|
||||||
|
(("-llcms") "-llcms2")
|
||||||
|
(("lcms/lcms\\.h") "lcms2/lcms2.h")
|
||||||
|
(("lcms\\.h") "lcms2.h")))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
'(#:configure-flags '("--enable-ILUT=yes") ; build utility library
|
||||||
|
#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(add-before 'check 'fix-tests
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
;; Fix hard-coded /bin/bash reference.
|
||||||
|
(substitute* '("test/Makefile")
|
||||||
|
(("TESTS_ENVIRONMENT = /bin/bash")
|
||||||
|
(string-append "TESTS_ENVIRONMENT = "
|
||||||
|
(assoc-ref inputs "bash")
|
||||||
|
"/bin/bash")))
|
||||||
|
#t)))))
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
(inputs
|
||||||
|
`(("lcms" ,lcms)
|
||||||
|
("libjpeg" ,libjpeg)
|
||||||
|
("libmng" ,libmng)
|
||||||
|
("libpng" ,libpng)
|
||||||
|
("libtiff" ,libtiff)
|
||||||
|
("openexr" ,openexr)
|
||||||
|
("zlib" ,zlib)))
|
||||||
|
(synopsis "Library for manipulating many image formats")
|
||||||
|
(description "Developer's Image Library (DevIL) is a library to develop
|
||||||
|
applications with support for many types of images. DevIL can load, save,
|
||||||
|
convert, manipulate, filter and display a wide variety of image formats.")
|
||||||
|
(home-page "http://openil.sourceforge.net")
|
||||||
|
(license license:lgpl2.1+)))
|
||||||
|
|
||||||
|
(define-public jasper
|
||||||
|
(package
|
||||||
|
(name "jasper")
|
||||||
|
(version "1.900.1")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "https://www.ece.uvic.ca/~frodo/jasper"
|
||||||
|
"/software/jasper-" version ".zip"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b"))
|
||||||
|
(patches (list (search-patch "jasper-CVE-2008-3522.patch")))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(native-inputs
|
||||||
|
`(("unzip" ,unzip)))
|
||||||
|
(synopsis "JPEG-2000 library")
|
||||||
|
(description "The JasPer Project is an initiative to provide a reference
|
||||||
|
implementation of the codec specified in the JPEG-2000 Part-1 standard (i.e.,
|
||||||
|
ISO/IEC 15444-1).")
|
||||||
|
(home-page "https://www.ece.uvic.ca/~frodo/jasper/")
|
||||||
|
(license (license:x11-style "file://LICENSE"))))
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
|
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
|
||||||
|
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -22,7 +23,8 @@
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix build-system perl)
|
#:use-module (guix build-system perl)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module ((guix licenses) #:select (fsf-free))
|
#:use-module (guix utils)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
#:use-module (gnu packages algebra)
|
#:use-module (gnu packages algebra)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
|
|
@ -104,7 +106,7 @@ including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG,
|
||||||
and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and
|
and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and
|
||||||
transform images, adjust image colors, apply various special effects, or draw
|
transform images, adjust image colors, apply various special effects, or draw
|
||||||
text, lines, polygons, ellipses and Bézier curves.")
|
text, lines, polygons, ellipses and Bézier curves.")
|
||||||
(license (fsf-free "http://www.imagemagick.org/script/license.php"))))
|
(license (license:fsf-free "http://www.imagemagick.org/script/license.php"))))
|
||||||
|
|
||||||
(define-public perl-image-magick
|
(define-public perl-image-magick
|
||||||
(package
|
(package
|
||||||
|
|
@ -149,3 +151,50 @@ Use it to create, edit, compose, or convert bitmap images from within a Perl
|
||||||
script.")
|
script.")
|
||||||
;; See Magick.pm
|
;; See Magick.pm
|
||||||
(license (package-license imagemagick))))
|
(license (package-license imagemagick))))
|
||||||
|
|
||||||
|
(define-public graphicsmagick
|
||||||
|
(package
|
||||||
|
(name "graphicsmagick")
|
||||||
|
(version "1.3.23")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "ftp://ftp.graphicsmagick.org/pub/"
|
||||||
|
"GraphicsMagick/" (version-major+minor version)
|
||||||
|
"/GraphicsMagick-" version ".tar.xz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"03g6l2h8cmf231y1vma0z7x85070jm1ysgs9ppqcd3jj56jka9gx"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
`(#:configure-flags
|
||||||
|
(list "--with-frozenpaths"
|
||||||
|
"--enable-shared=yes"
|
||||||
|
"--with-x=yes"
|
||||||
|
(string-append "--with-gs-font-dir="
|
||||||
|
(assoc-ref %build-inputs "gs-fonts")
|
||||||
|
"/share/fonts/type1/ghostscript"))))
|
||||||
|
(inputs
|
||||||
|
`(("graphviz" ,graphviz)
|
||||||
|
("ghostscript" ,ghostscript)
|
||||||
|
("gs-fonts" ,gs-fonts)
|
||||||
|
("lcms" ,lcms)
|
||||||
|
("libx11" ,libx11)
|
||||||
|
("libxml2" ,libxml2)
|
||||||
|
("libtiff" ,libtiff)
|
||||||
|
("libpng" ,libpng)
|
||||||
|
("libjpeg" ,libjpeg)
|
||||||
|
("freetype" ,freetype)
|
||||||
|
("bzip2" ,bzip2)
|
||||||
|
("xz" ,xz)
|
||||||
|
("zlib" ,zlib)))
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
(outputs '("out" ; 13 MiB
|
||||||
|
"doc")) ; ~7 MiB
|
||||||
|
(home-page "http://www.graphicsmagick.org")
|
||||||
|
(synopsis "Create, edit, compose, or convert bitmap images")
|
||||||
|
(description
|
||||||
|
"GraphicsMagick provides a comprehensive collection of utilities,
|
||||||
|
programming interfaces, and GUIs, to support file format conversion, image
|
||||||
|
processing, and 2D vector rendering.")
|
||||||
|
(license license:expat)))
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,59 @@
|
||||||
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
|
;;; Copyright © 2015 Roel Janssen <roel@gnu.org>
|
||||||
|
;;;
|
||||||
|
;;; This file is part of GNU Guix.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||||
|
;;; under the terms of the GNU General Public License as published by
|
||||||
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||||
|
;;; your option) any later version.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||||
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
;;; GNU General Public License for more details.
|
||||||
|
;;;
|
||||||
|
;;; You should have received a copy of the GNU General Public License
|
||||||
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
(define-module (gnu packages inklingreader)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (gnu packages)
|
||||||
|
#:use-module (gnu packages autotools)
|
||||||
|
#:use-module (gnu packages glib)
|
||||||
|
#:use-module (gnu packages gnome)
|
||||||
|
#:use-module (gnu packages gtk)
|
||||||
|
#:use-module (gnu packages libusb)
|
||||||
|
#:use-module (gnu packages pkg-config))
|
||||||
|
|
||||||
|
(define-public inklingreader
|
||||||
|
(package
|
||||||
|
(name "inklingreader")
|
||||||
|
(version "0.8")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"ftp://alpha.gnu.org/gnu/inklingreader/inklingreader-"
|
||||||
|
version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0ikg95mgwfqh0bq4dzvkfmdiycacqvv27g91hl6adwk5y3gzl96g"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(inputs
|
||||||
|
`(("glib" ,glib)
|
||||||
|
("cairo" ,cairo)
|
||||||
|
("gtk+" ,gtk+)
|
||||||
|
("librsvg" ,librsvg)
|
||||||
|
("libusb" ,libusb)))
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
(home-page "https://www.gnu.org/software/inklingreader/")
|
||||||
|
(synopsis "Wacom Inkling sketch format conversion and manipulation")
|
||||||
|
(description
|
||||||
|
"GNU InklingReader is a package to support the Wacom Inkling device,
|
||||||
|
including data conversion to various free formats, basic editing features,
|
||||||
|
and an Inkscape plugin.")
|
||||||
|
(license license:gpl3+)))
|
||||||
|
|
@ -74,7 +74,11 @@
|
||||||
("perl" ,perl)
|
("perl" ,perl)
|
||||||
("pkg-config" ,pkg-config)))
|
("pkg-config" ,pkg-config)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases (alist-cons-after
|
`(;; Add '-std=c++11', required by recent versions of GLibmm & co.
|
||||||
|
;; Use '-g0' to reduce disk usage during the build.
|
||||||
|
#:configure-flags '("CXXFLAGS=-g0 -O2 -fopenmp -std=c++11")
|
||||||
|
|
||||||
|
#:phases (alist-cons-after
|
||||||
'unpack 'fix-test-includes
|
'unpack 'fix-test-includes
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "src/cxxtests.cpp"
|
(substitute* "src/cxxtests.cpp"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
|
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
|
||||||
|
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -17,7 +18,7 @@
|
||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages irssi)
|
(define-module (gnu packages irssi)
|
||||||
#:use-module (guix licenses)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
|
|
@ -25,19 +26,20 @@
|
||||||
#:use-module (gnu packages glib)
|
#:use-module (gnu packages glib)
|
||||||
#:use-module (gnu packages ncurses)
|
#:use-module (gnu packages ncurses)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages pkg-config))
|
#:use-module (gnu packages pkg-config)
|
||||||
|
#:use-module (gnu packages tls))
|
||||||
|
|
||||||
(define-public irssi
|
(define-public irssi
|
||||||
(package
|
(package
|
||||||
(name "irssi")
|
(name "irssi")
|
||||||
(version "0.8.15")
|
(version "0.8.17")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://www.irssi.org/files/irssi-"
|
(uri (string-append "http://www.irssi.org/files/irssi-"
|
||||||
version ".tar.bz2"))
|
version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"19m0aah9bhc70dnhh7kpydbsz5n35l0l9knxav1df0sic3xicbf1"))))
|
"01v82q2pfiimx6lh271kdvgp8hl4pahc3srg04fqzxgdsb5015iw"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:phases
|
||||||
|
|
@ -54,7 +56,8 @@
|
||||||
%standard-phases)))
|
%standard-phases)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("glib" ,glib)
|
`(("glib" ,glib)
|
||||||
("ncurses" ,ncurses)))
|
("ncurses" ,ncurses)
|
||||||
|
("openssl" ,openssl)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)
|
`(("pkg-config" ,pkg-config)
|
||||||
("perl" ,perl)))
|
("perl" ,perl)))
|
||||||
|
|
@ -63,4 +66,4 @@
|
||||||
(description
|
(description
|
||||||
"Irssi is a terminal based IRC client for UNIX systems. It also supports
|
"Irssi is a terminal based IRC client for UNIX systems. It also supports
|
||||||
SILC and ICB protocols via plugins.")
|
SILC and ICB protocols via plugins.")
|
||||||
(license gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
|
||||||
|
|
@ -135,7 +135,7 @@ is implemented.")
|
||||||
(define-public ant
|
(define-public ant
|
||||||
(package
|
(package
|
||||||
(name "ant")
|
(name "ant")
|
||||||
(version "1.9.4")
|
(version "1.9.6")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -143,7 +143,7 @@ is implemented.")
|
||||||
version "-src.tar.gz"))
|
version "-src.tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"09kf5s1ir0rdrclsy174bsvbdcbajza9fja490w4mmvcpkw3zpak"))))
|
"1396wflczyxjxl603dhxjvd559f289lha9y2f04f71c7hapjl3am"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; no "check" target
|
`(#:tests? #f ; no "check" target
|
||||||
|
|
@ -576,7 +576,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
|
||||||
(license license:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
(define-public icedtea7
|
(define-public icedtea7
|
||||||
(let* ((version "2.6.1")
|
(let* ((version "2.6.2")
|
||||||
(drop (lambda (name hash)
|
(drop (lambda (name hash)
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -594,7 +594,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
|
||||||
version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0s107vi1530a5dyxacysc4m64zshgg2d3xpndsc0ws99wz0zmr6c"))
|
"0xi0w8gpxx3r68hyi7fb991hxb3rqfp7895nfsl4wj3sa1f5ds5y"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
'(substitute* "Makefile.in"
|
'(substitute* "Makefile.in"
|
||||||
|
|
@ -728,24 +728,24 @@ build process and its dependencies, whereas Make uses Makefile format.")
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("openjdk-drop"
|
`(("openjdk-drop"
|
||||||
,(drop "openjdk"
|
,(drop "openjdk"
|
||||||
"0gs6vbj5c09516r460r68i7vm652sb25h973kq9hfx749qbs0s01"))
|
"0jabxc8iw7ciz6f2qshcpla66qniy686vnxnfx3h2yw7syvas4a9"))
|
||||||
("corba-drop"
|
("corba-drop"
|
||||||
,(drop "corba"
|
,(drop "corba"
|
||||||
"1y7nf6hqry1az28i3b6ln5cs82cww1jj4r61jk54ab8s2xydj0yd"))
|
"1bw22djg8mfqqn8kp8mpbj9vi4pl8dk67qwwrny67d0fvirixylj"))
|
||||||
("jaxp-drop"
|
("jaxp-drop"
|
||||||
,(drop "jaxp"
|
,(drop "jaxp"
|
||||||
"1szs2w0p496k1qi3yl1fymj0g10lgq31am35zlalcz7pi4l4q360"))
|
"1h3g2dwbj8ihicl73qbr4cvvc3i5bs5ckrpja1nx6g5b56xa7kcl"))
|
||||||
("jaxws-drop"
|
("jaxws-drop"
|
||||||
,(drop "jaxws"
|
,(drop "jaxws"
|
||||||
"17xfy9q2zdpap7m2prbf937x55jm3pwrqpp1fdlridraqrfzjprd"))
|
"1m1h7455qn4pdhb5yamdl9965iz9260lzwl3njcs35vi14v7fihl"))
|
||||||
("jdk-drop"
|
("jdk-drop"
|
||||||
,(drop "jdk"
|
,(drop "jdk"
|
||||||
"0qskhwr4nml49zhbppnq8ldj0x001bl37mrcpxslbnsdw5skw258"))
|
"1wcaxf2chnlpk34q04c23im6z32dy8fr6f9giz3ih65nyvah3n3s"))
|
||||||
("langtools-drop"
|
("langtools-drop"
|
||||||
,(drop "langtools"
|
,(drop "langtools"
|
||||||
"0hyxrrb0zrx1pq1s90bmim94hwfligr0ajzs1874da4gclbbvfbd"))
|
"0da3cmm8nwz7dk2sqnywvidaa0kjnyzzi33p2lkdi4415f8yhgx5"))
|
||||||
("hotspot-drop"
|
("hotspot-drop"
|
||||||
,(drop "hotspot"
|
,(drop "hotspot"
|
||||||
"1cv8df2s89mnjzg4rja4i89d4fr8n0c3v5y2cqbww1ma1463n100"))
|
"0fn3cjhqsgbkfzychkvvw6whxil2n9dr6q0196ywxzkinny1hjcq"))
|
||||||
,@(fold alist-delete (package-native-inputs icedtea6)
|
,@(fold alist-delete (package-native-inputs icedtea6)
|
||||||
'("openjdk6-src")))))))
|
'("openjdk6-src")))))))
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,223 @@
|
||||||
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
|
;;; Copyright © 2015 David Thompson <davet@gnu.org>
|
||||||
|
;;;
|
||||||
|
;;; This file is part of GNU Guix.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||||
|
;;; under the terms of the GNU General Public License as published by
|
||||||
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||||
|
;;; your option) any later version.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||||
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
;;; GNU General Public License for more details.
|
||||||
|
;;;
|
||||||
|
;;; You should have received a copy of the GNU General Public License
|
||||||
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
(define-module (gnu packages kodi)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix utils)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (gnu packages algebra)
|
||||||
|
#:use-module (gnu packages audio)
|
||||||
|
#:use-module (gnu packages autotools)
|
||||||
|
#:use-module (gnu packages avahi)
|
||||||
|
#:use-module (gnu packages base)
|
||||||
|
#:use-module (gnu packages boost)
|
||||||
|
#:use-module (gnu packages cdrom)
|
||||||
|
#:use-module (gnu packages cmake)
|
||||||
|
#:use-module (gnu packages compression)
|
||||||
|
#:use-module (gnu packages curl)
|
||||||
|
#:use-module (gnu packages databases)
|
||||||
|
#:use-module (gnu packages doxygen)
|
||||||
|
#:use-module (gnu packages fontutils)
|
||||||
|
#:use-module (gnu packages fribidi)
|
||||||
|
#:use-module (gnu packages gettext)
|
||||||
|
#:use-module (gnu packages ghostscript)
|
||||||
|
#:use-module (gnu packages gawk)
|
||||||
|
#:use-module (gnu packages gl)
|
||||||
|
#:use-module (gnu packages glib)
|
||||||
|
#:use-module (gnu packages gperf)
|
||||||
|
#:use-module (gnu packages gnunet)
|
||||||
|
#:use-module (gnu packages gnupg)
|
||||||
|
#:use-module (gnu packages image)
|
||||||
|
#:use-module (gnu packages java)
|
||||||
|
#:use-module (gnu packages libusb)
|
||||||
|
#:use-module (gnu packages linux)
|
||||||
|
#:use-module (gnu packages mp3)
|
||||||
|
#:use-module (gnu packages pcre)
|
||||||
|
#:use-module (gnu packages pkg-config)
|
||||||
|
#:use-module (gnu packages pulseaudio)
|
||||||
|
#:use-module (gnu packages python)
|
||||||
|
#:use-module (gnu packages samba)
|
||||||
|
#:use-module (gnu packages sdl)
|
||||||
|
#:use-module (gnu packages ssh)
|
||||||
|
#:use-module (gnu packages swig)
|
||||||
|
#:use-module (gnu packages textutils)
|
||||||
|
#:use-module (gnu packages tls)
|
||||||
|
#:use-module (gnu packages video)
|
||||||
|
#:use-module (gnu packages web)
|
||||||
|
#:use-module (gnu packages xdisorg)
|
||||||
|
#:use-module (gnu packages xiph)
|
||||||
|
#:use-module (gnu packages xml)
|
||||||
|
#:use-module (gnu packages xorg)
|
||||||
|
#:use-module (gnu packages yasm)
|
||||||
|
#:use-module (gnu packages zip))
|
||||||
|
|
||||||
|
(define-public kodi
|
||||||
|
(package
|
||||||
|
(name "kodi")
|
||||||
|
(version "15.2")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "http://mirrors.kodi.tv/releases/source/"
|
||||||
|
version "-Isengard.tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"043i0f1crx9glwxil4xm45z5kxpkrx316gi4ir4d3rbd5safp2nx"))
|
||||||
|
(snippet
|
||||||
|
;; Delete bundled ffmpeg.
|
||||||
|
;; TODO: Delete every other bundled library.
|
||||||
|
'(begin
|
||||||
|
(use-modules (guix build utils))
|
||||||
|
(delete-file-recursively "tools/depends/target/ffmpeg")))
|
||||||
|
(modules '((guix build utils)))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
'(#:configure-flags '("--with-ffmpeg=shared") ; don't use bundled ffmpeg
|
||||||
|
#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
;; JsonSchemaBuilder is a small tool needed by the build system that
|
||||||
|
;; comes bundled with the source. The build system tries to build it
|
||||||
|
;; during the bootstrapping phase, which causes serious issues
|
||||||
|
;; because there's no time for shebangs to be patched. So, we
|
||||||
|
;; bootstrap it on our own instead.
|
||||||
|
(add-after 'unpack 'bootstrap-jsonschemabuilder
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(let ((dir "tools/depends/native/JsonSchemaBuilder/src"))
|
||||||
|
(with-directory-excursion dir
|
||||||
|
(zero? (system* "sh" "autogen.sh"))))))
|
||||||
|
;; Now we can do the regular bootstrapping process, but only after
|
||||||
|
;; the first round of shebang patching. We must repeat the patching
|
||||||
|
;; after bootstrapping so that all of the files generated by the
|
||||||
|
;; Autotools et al. are patched appropriately.
|
||||||
|
(add-after 'patch-source-shebangs 'bootstrap
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
;; We bootstrapped JsonSchemaBuilder in the previous phase, so we
|
||||||
|
;; need to make sure it isn't done a second time. Otherwise, it
|
||||||
|
;; would undo the shebang patching that we worked so hard for.
|
||||||
|
(substitute* '("tools/depends/native/JsonSchemaBuilder/Makefile")
|
||||||
|
(("\\./autogen\\.sh") ""))
|
||||||
|
;; This essentially does what their 'bootstrap' script does, but
|
||||||
|
;; additionally passes the correct CONFIG_SHELL.
|
||||||
|
(let ((bash (string-append (assoc-ref inputs "bash") "/bin/sh")))
|
||||||
|
(define (run-make makefile)
|
||||||
|
(zero? (system* "make" "-f" makefile
|
||||||
|
"BOOTSTRAP_STANDALONE=1"
|
||||||
|
(string-append "CONFIG_SHELL=" bash))))
|
||||||
|
(and (run-make "bootstrap.mk")
|
||||||
|
(run-make "codegenerator.mk")))))
|
||||||
|
(add-after 'bootstrap 'patch-source-shebangs-again
|
||||||
|
(assoc-ref %standard-phases 'patch-source-shebangs))
|
||||||
|
;; 3 tests fail that appear harmless, so we disable them.
|
||||||
|
(add-before 'check 'disable-some-tests
|
||||||
|
(lambda _
|
||||||
|
(substitute* '("xbmc/utils/test/TestSystemInfo.cpp")
|
||||||
|
(("TEST_F\\(TestSystemInfo, GetOsPrettyNameWithVersion\\)")
|
||||||
|
"TEST_F(TestSystemInfo, DISABLED_GetOsPrettyNameWithVersion)")
|
||||||
|
(("TEST_F\\(TestSystemInfo, GetOsName\\)")
|
||||||
|
"TEST_F(TestSystemInfo, DISABLED_GetOsName)")
|
||||||
|
(("TEST_F\\(TestSystemInfo, GetOsVersion\\)")
|
||||||
|
"TEST_F(TestSystemInfo, DISABLED_GetOsVersion)")))))))
|
||||||
|
;; TODO: Add dependencies for:
|
||||||
|
;; - vdpau
|
||||||
|
;; - nfs
|
||||||
|
;;
|
||||||
|
;; FIXME: libusb detection fails.
|
||||||
|
;;
|
||||||
|
;; FIXME: As you can see, we use a lot of external libraries, but it seems
|
||||||
|
;; that a few bundled ones are still being used.
|
||||||
|
(native-inputs
|
||||||
|
`(("autoconf" ,autoconf)
|
||||||
|
("automake" ,automake)
|
||||||
|
("cmake" ,cmake)
|
||||||
|
("doxygen" ,doxygen)
|
||||||
|
("gawk" ,gawk)
|
||||||
|
("gettext" ,gnu-gettext)
|
||||||
|
("icedtea7" ,icedtea7) ; needed at build-time only, mandatory
|
||||||
|
("libtool" ,libtool)
|
||||||
|
("pkg-config" ,pkg-config)
|
||||||
|
("swig" ,swig)
|
||||||
|
("which" ,which)
|
||||||
|
("yasm" ,yasm)))
|
||||||
|
(inputs
|
||||||
|
`(("alsa-lib" ,alsa-lib)
|
||||||
|
("avahi" ,avahi)
|
||||||
|
("bluez" ,bluez)
|
||||||
|
("boost" ,boost)
|
||||||
|
("bzip2" ,bzip2)
|
||||||
|
("curl" ,curl)
|
||||||
|
("dbus" ,dbus)
|
||||||
|
("enca" ,enca)
|
||||||
|
("eudev" ,eudev)
|
||||||
|
("ffmpeg" ,ffmpeg)
|
||||||
|
("flac" ,flac)
|
||||||
|
("fontconfig" ,fontconfig)
|
||||||
|
("freetype" ,freetype)
|
||||||
|
("fribidi" ,fribidi)
|
||||||
|
("glew" ,glew)
|
||||||
|
("gnutls" ,gnutls)
|
||||||
|
("gperf" ,gperf)
|
||||||
|
("jasper" ,jasper)
|
||||||
|
("lame" ,lame)
|
||||||
|
("libass" ,libass)
|
||||||
|
("libbluray" ,libbluray)
|
||||||
|
("libcap" ,libcap)
|
||||||
|
("libcdio" ,libcdio)
|
||||||
|
("libgcrypt" ,libgcrypt)
|
||||||
|
("libjpeg" ,libjpeg)
|
||||||
|
("libltdl" ,libltdl)
|
||||||
|
("libmad" ,libmad)
|
||||||
|
("libmicrohttpd" ,libmicrohttpd)
|
||||||
|
("libmodplug" ,libmodplug)
|
||||||
|
("libmpeg2" ,libmpeg2)
|
||||||
|
("libogg" ,libogg)
|
||||||
|
("libpng" ,libpng)
|
||||||
|
("libsamplerate" ,libsamplerate)
|
||||||
|
("libssh" ,libssh)
|
||||||
|
("libtiff" ,libtiff)
|
||||||
|
("libva" ,libva)
|
||||||
|
("libvorbis" ,libvorbis)
|
||||||
|
("libxml2" ,libxml2)
|
||||||
|
("libxmu" ,libxmu)
|
||||||
|
("libxrandr" ,libxrandr)
|
||||||
|
("libxrender" ,libxrender)
|
||||||
|
("libxslt" ,libxslt)
|
||||||
|
("libxt" ,libxt)
|
||||||
|
("libyajl" ,libyajl)
|
||||||
|
("lzo" ,lzo)
|
||||||
|
("mesa-utils" ,mesa-utils)
|
||||||
|
("mysql" ,mysql)
|
||||||
|
("openssl" ,openssl)
|
||||||
|
("pcre" ,pcre)
|
||||||
|
("pulseaudio" ,pulseaudio)
|
||||||
|
("python" ,python-2)
|
||||||
|
("samba" ,samba)
|
||||||
|
("sdl2" ,sdl2)
|
||||||
|
("sqlite" ,sqlite)
|
||||||
|
("taglib" ,taglib)
|
||||||
|
("tinyxml" ,tinyxml)
|
||||||
|
("unzip" ,unzip)
|
||||||
|
("zip" ,zip)
|
||||||
|
("zlib" ,zlib)))
|
||||||
|
(synopsis "Media center for home theater computers")
|
||||||
|
(description "Kodi is a media center application for playing videos,
|
||||||
|
music, games, etc. Kodi is highly customizable and features a theme and
|
||||||
|
plug-in system.")
|
||||||
|
(home-page "http://kodi.tv")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
@ -676,7 +676,7 @@ and to return information on pronunciations, meanings and synonyms.")
|
||||||
(define-public libreoffice
|
(define-public libreoffice
|
||||||
(package
|
(package
|
||||||
(name "libreoffice")
|
(name "libreoffice")
|
||||||
(version "5.0.0.2")
|
(version "5.0.3.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -685,7 +685,7 @@ and to return information on pronunciations, meanings and synonyms.")
|
||||||
"http://download.documentfoundation.org/libreoffice/src/"
|
"http://download.documentfoundation.org/libreoffice/src/"
|
||||||
(version-prefix version 3) "/libreoffice-" version ".tar.xz"))
|
(version-prefix version 3) "/libreoffice-" version ".tar.xz"))
|
||||||
(sha256 (base32
|
(sha256 (base32
|
||||||
"0mzvxc4i5999xzmhgwrfvpvyx5772jylx5mary86drrld8klq7py"))))
|
"1gflcsnw7bx02jbb2x5darf56x0qgia03ylaycadk68ikibckybp"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(;; autoreconf is run by the LibreOffice build system, since after
|
`(;; autoreconf is run by the LibreOffice build system, since after
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright 2014 John Darrington <jmd@gnu.org>
|
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
|
||||||
|
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -23,6 +24,7 @@
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages image)
|
#:use-module (gnu packages image)
|
||||||
|
#:use-module (gnu packages libevent)
|
||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages tls)
|
||||||
#:use-module (gnu packages xorg)
|
#:use-module (gnu packages xorg)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
|
|
@ -31,21 +33,21 @@
|
||||||
(define-public links
|
(define-public links
|
||||||
(package
|
(package
|
||||||
(name "links")
|
(name "links")
|
||||||
(version "2.8")
|
(version "2.12")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://links.twibright.com/download/"
|
(uri (string-append "http://links.twibright.com/download/"
|
||||||
name "-" version ".tar.bz2"))
|
name "-" version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "15h07498z52jfdahzgvkphg1f7qvxnpbyfn2xmsls0d2dwwdll3r"))))
|
(base32 "0knq15yrp60s4jh92aacw8yfc2pcv3bqsw7dba7h5s6ivq8ihhcq"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases (alist-replace
|
`(#:phases (alist-replace
|
||||||
'configure
|
'configure
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
;; The tarball uses a very old version of autconf. It doesn't understand
|
;; The tarball uses a very old version of autconf. It doesn't
|
||||||
;; extra flags like `--enable-fast-install', so we need to
|
;; understand extra flags like `--enable-fast-install', so
|
||||||
;; invoke it with just what it understand.
|
;; we need to invoke it with just what it understands.
|
||||||
(let ((out (assoc-ref outputs "out")))
|
(let ((out (assoc-ref outputs "out")))
|
||||||
;; 'configure' doesn't understand '--host'.
|
;; 'configure' doesn't understand '--host'.
|
||||||
,@(if (%current-target-system)
|
,@(if (%current-target-system)
|
||||||
|
|
@ -55,28 +57,25 @@
|
||||||
(zero?
|
(zero?
|
||||||
(system* "./configure"
|
(system* "./configure"
|
||||||
(string-append "--prefix=" out)
|
(string-append "--prefix=" out)
|
||||||
"--enable-graphics"
|
"--enable-graphics"))))
|
||||||
))))
|
|
||||||
%standard-phases)))
|
%standard-phases)))
|
||||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||||
(inputs `(("zlib" ,zlib)
|
(inputs `(("zlib" ,zlib)
|
||||||
("openssl" ,openssl)
|
("openssl" ,openssl)
|
||||||
("libjpeg" ,libjpeg)
|
("libjpeg" ,libjpeg)
|
||||||
("libtiff" ,libtiff)
|
("libtiff" ,libtiff)
|
||||||
|
("libevent" ,libevent)
|
||||||
("libpng" ,libpng)
|
("libpng" ,libpng)
|
||||||
("libxt" ,libxt)))
|
("libxt" ,libxt)))
|
||||||
(synopsis "Text and graphics mode web browser")
|
(synopsis "Text and graphics mode web browser")
|
||||||
(description "Links is a graphics and text mode web browser, with many
|
(description "Links is a graphics and text mode web browser, with many
|
||||||
features including, tables, builtin image display, bookmarks, SSL and more.")
|
features including, tables, builtin image display, bookmarks, SSL and more.")
|
||||||
(home-page "http://links.twibright.com")
|
(home-page "http://links.twibright.com")
|
||||||
;; The distribution contains a copy of GPLv2
|
;; The distribution contains a copy of GPLv2
|
||||||
;; However, the copyright notices simply say:
|
;; However, the copyright notices simply say:
|
||||||
;; "This file is a part of the Links program, released under GPL."
|
;; "This file is a part of the Links program, released under GPL."
|
||||||
;; Therefore, under the provisions of Section 9, we can choose
|
;; Therefore, under the provisions of Section 9, we can choose
|
||||||
;; any version ever published by the FSF
|
;; any version ever published by the FSF.
|
||||||
;; One file (https.c) contains an exception permitting
|
;; One file (https.c) contains an exception permitting
|
||||||
;; linking of the program with openssl
|
;; linking of the program with openssl.
|
||||||
(license license:gpl1+)))
|
(license license:gpl1+)))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/x86 4.2.0-gnu Kernel Configuration
|
# Linux/x86 4.3.0-gnu Kernel Configuration
|
||||||
#
|
#
|
||||||
# CONFIG_64BIT is not set
|
# CONFIG_64BIT is not set
|
||||||
CONFIG_X86_32=y
|
CONFIG_X86_32=y
|
||||||
|
|
@ -131,16 +131,17 @@ CONFIG_SRCU=y
|
||||||
# CONFIG_TASKS_RCU is not set
|
# CONFIG_TASKS_RCU is not set
|
||||||
CONFIG_RCU_STALL_COMMON=y
|
CONFIG_RCU_STALL_COMMON=y
|
||||||
# CONFIG_TREE_RCU_TRACE is not set
|
# CONFIG_TREE_RCU_TRACE is not set
|
||||||
# CONFIG_RCU_NOCB_CPU is not set
|
|
||||||
# CONFIG_RCU_EXPEDITE_BOOT is not set
|
# CONFIG_RCU_EXPEDITE_BOOT is not set
|
||||||
CONFIG_BUILD_BIN2C=y
|
CONFIG_BUILD_BIN2C=y
|
||||||
# CONFIG_IKCONFIG is not set
|
# CONFIG_IKCONFIG is not set
|
||||||
CONFIG_LOG_BUF_SHIFT=17
|
CONFIG_LOG_BUF_SHIFT=17
|
||||||
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
|
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
|
||||||
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
|
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
|
||||||
|
CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
|
||||||
CONFIG_CGROUPS=y
|
CONFIG_CGROUPS=y
|
||||||
# CONFIG_CGROUP_DEBUG is not set
|
# CONFIG_CGROUP_DEBUG is not set
|
||||||
CONFIG_CGROUP_FREEZER=y
|
CONFIG_CGROUP_FREEZER=y
|
||||||
|
CONFIG_CGROUP_PIDS=y
|
||||||
CONFIG_CGROUP_DEVICE=y
|
CONFIG_CGROUP_DEVICE=y
|
||||||
CONFIG_CPUSETS=y
|
CONFIG_CPUSETS=y
|
||||||
CONFIG_PROC_PID_CPUSET=y
|
CONFIG_PROC_PID_CPUSET=y
|
||||||
|
|
@ -206,7 +207,9 @@ CONFIG_BPF_SYSCALL=y
|
||||||
CONFIG_SHMEM=y
|
CONFIG_SHMEM=y
|
||||||
CONFIG_AIO=y
|
CONFIG_AIO=y
|
||||||
CONFIG_ADVISE_SYSCALLS=y
|
CONFIG_ADVISE_SYSCALLS=y
|
||||||
|
CONFIG_USERFAULTFD=y
|
||||||
CONFIG_PCI_QUIRKS=y
|
CONFIG_PCI_QUIRKS=y
|
||||||
|
CONFIG_MEMBARRIER=y
|
||||||
# CONFIG_EMBEDDED is not set
|
# CONFIG_EMBEDDED is not set
|
||||||
CONFIG_HAVE_PERF_EVENTS=y
|
CONFIG_HAVE_PERF_EVENTS=y
|
||||||
|
|
||||||
|
|
@ -222,15 +225,17 @@ CONFIG_SLUB_DEBUG=y
|
||||||
CONFIG_SLUB=y
|
CONFIG_SLUB=y
|
||||||
# CONFIG_SLOB is not set
|
# CONFIG_SLOB is not set
|
||||||
CONFIG_SLUB_CPU_PARTIAL=y
|
CONFIG_SLUB_CPU_PARTIAL=y
|
||||||
CONFIG_SYSTEM_TRUSTED_KEYRING=y
|
# CONFIG_SYSTEM_DATA_VERIFICATION is not set
|
||||||
CONFIG_PROFILING=y
|
CONFIG_PROFILING=y
|
||||||
CONFIG_TRACEPOINTS=y
|
CONFIG_TRACEPOINTS=y
|
||||||
|
CONFIG_KEXEC_CORE=y
|
||||||
CONFIG_OPROFILE=m
|
CONFIG_OPROFILE=m
|
||||||
# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
|
# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
|
||||||
CONFIG_HAVE_OPROFILE=y
|
CONFIG_HAVE_OPROFILE=y
|
||||||
CONFIG_OPROFILE_NMI_TIMER=y
|
CONFIG_OPROFILE_NMI_TIMER=y
|
||||||
CONFIG_KPROBES=y
|
CONFIG_KPROBES=y
|
||||||
CONFIG_JUMP_LABEL=y
|
CONFIG_JUMP_LABEL=y
|
||||||
|
# CONFIG_STATIC_KEYS_SELFTEST is not set
|
||||||
CONFIG_OPTPROBES=y
|
CONFIG_OPTPROBES=y
|
||||||
CONFIG_KPROBES_ON_FTRACE=y
|
CONFIG_KPROBES_ON_FTRACE=y
|
||||||
CONFIG_UPROBES=y
|
CONFIG_UPROBES=y
|
||||||
|
|
@ -297,6 +302,11 @@ CONFIG_MODULE_UNLOAD=y
|
||||||
CONFIG_MODVERSIONS=y
|
CONFIG_MODVERSIONS=y
|
||||||
CONFIG_MODULE_SRCVERSION_ALL=y
|
CONFIG_MODULE_SRCVERSION_ALL=y
|
||||||
# CONFIG_MODULE_SIG is not set
|
# CONFIG_MODULE_SIG is not set
|
||||||
|
# CONFIG_MODULE_SIG_SHA1 is not set
|
||||||
|
# CONFIG_MODULE_SIG_SHA224 is not set
|
||||||
|
# CONFIG_MODULE_SIG_SHA256 is not set
|
||||||
|
# CONFIG_MODULE_SIG_SHA384 is not set
|
||||||
|
# CONFIG_MODULE_SIG_SHA512 is not set
|
||||||
# CONFIG_MODULE_COMPRESS is not set
|
# CONFIG_MODULE_COMPRESS is not set
|
||||||
CONFIG_MODULES_TREE_LOOKUP=y
|
CONFIG_MODULES_TREE_LOOKUP=y
|
||||||
CONFIG_STOP_MACHINE=y
|
CONFIG_STOP_MACHINE=y
|
||||||
|
|
@ -389,7 +399,6 @@ CONFIG_PARAVIRT_SPINLOCKS=y
|
||||||
CONFIG_XEN=y
|
CONFIG_XEN=y
|
||||||
CONFIG_XEN_DOM0=y
|
CONFIG_XEN_DOM0=y
|
||||||
CONFIG_XEN_PVHVM=y
|
CONFIG_XEN_PVHVM=y
|
||||||
CONFIG_XEN_MAX_DOMAIN_MEMORY=64
|
|
||||||
CONFIG_XEN_SAVE_RESTORE=y
|
CONFIG_XEN_SAVE_RESTORE=y
|
||||||
# CONFIG_XEN_DEBUG_FS is not set
|
# CONFIG_XEN_DEBUG_FS is not set
|
||||||
CONFIG_KVM_GUEST=y
|
CONFIG_KVM_GUEST=y
|
||||||
|
|
@ -462,7 +471,8 @@ CONFIG_X86_MCE_AMD=y
|
||||||
CONFIG_X86_MCE_THRESHOLD=y
|
CONFIG_X86_MCE_THRESHOLD=y
|
||||||
CONFIG_X86_MCE_INJECT=m
|
CONFIG_X86_MCE_INJECT=m
|
||||||
CONFIG_X86_THERMAL_VECTOR=y
|
CONFIG_X86_THERMAL_VECTOR=y
|
||||||
CONFIG_VM86=y
|
# CONFIG_X86_LEGACY_VM86 is not set
|
||||||
|
# CONFIG_VM86 is not set
|
||||||
CONFIG_X86_16BIT=y
|
CONFIG_X86_16BIT=y
|
||||||
CONFIG_X86_ESPFIX32=y
|
CONFIG_X86_ESPFIX32=y
|
||||||
# CONFIG_TOSHIBA is not set
|
# CONFIG_TOSHIBA is not set
|
||||||
|
|
@ -538,6 +548,9 @@ CONFIG_PGTABLE_MAPPING=y
|
||||||
CONFIG_GENERIC_EARLY_IOREMAP=y
|
CONFIG_GENERIC_EARLY_IOREMAP=y
|
||||||
CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
|
CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
|
||||||
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
|
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
|
||||||
|
CONFIG_IDLE_PAGE_TRACKING=y
|
||||||
|
CONFIG_FRAME_VECTOR=y
|
||||||
|
CONFIG_X86_PMEM_LEGACY_DEVICE=y
|
||||||
CONFIG_X86_PMEM_LEGACY=y
|
CONFIG_X86_PMEM_LEGACY=y
|
||||||
CONFIG_HIGHPTE=y
|
CONFIG_HIGHPTE=y
|
||||||
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
|
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
|
||||||
|
|
@ -552,7 +565,7 @@ CONFIG_X86_PAT=y
|
||||||
CONFIG_ARCH_USES_PG_UNCACHED=y
|
CONFIG_ARCH_USES_PG_UNCACHED=y
|
||||||
CONFIG_ARCH_RANDOM=y
|
CONFIG_ARCH_RANDOM=y
|
||||||
CONFIG_X86_SMAP=y
|
CONFIG_X86_SMAP=y
|
||||||
# CONFIG_X86_INTEL_MPX is not set
|
CONFIG_X86_INTEL_MPX=y
|
||||||
CONFIG_EFI=y
|
CONFIG_EFI=y
|
||||||
CONFIG_EFI_STUB=y
|
CONFIG_EFI_STUB=y
|
||||||
CONFIG_SECCOMP=y
|
CONFIG_SECCOMP=y
|
||||||
|
|
@ -576,6 +589,7 @@ CONFIG_HOTPLUG_CPU=y
|
||||||
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
|
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
|
||||||
# CONFIG_COMPAT_VDSO is not set
|
# CONFIG_COMPAT_VDSO is not set
|
||||||
# CONFIG_CMDLINE_BOOL is not set
|
# CONFIG_CMDLINE_BOOL is not set
|
||||||
|
CONFIG_MODIFY_LDT_SYSCALL=y
|
||||||
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
|
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
|
||||||
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
|
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
|
||||||
|
|
||||||
|
|
@ -584,6 +598,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
|
||||||
#
|
#
|
||||||
CONFIG_SUSPEND=y
|
CONFIG_SUSPEND=y
|
||||||
CONFIG_SUSPEND_FREEZER=y
|
CONFIG_SUSPEND_FREEZER=y
|
||||||
|
# CONFIG_SUSPEND_SKIP_SYNC is not set
|
||||||
CONFIG_HIBERNATE_CALLBACKS=y
|
CONFIG_HIBERNATE_CALLBACKS=y
|
||||||
CONFIG_HIBERNATION=y
|
CONFIG_HIBERNATION=y
|
||||||
CONFIG_PM_STD_PARTITION=""
|
CONFIG_PM_STD_PARTITION=""
|
||||||
|
|
@ -617,6 +632,8 @@ CONFIG_ACPI_BUTTON=y
|
||||||
CONFIG_ACPI_VIDEO=m
|
CONFIG_ACPI_VIDEO=m
|
||||||
CONFIG_ACPI_FAN=y
|
CONFIG_ACPI_FAN=y
|
||||||
CONFIG_ACPI_DOCK=y
|
CONFIG_ACPI_DOCK=y
|
||||||
|
CONFIG_ACPI_CPU_FREQ_PSS=y
|
||||||
|
CONFIG_ACPI_PROCESSOR_IDLE=y
|
||||||
CONFIG_ACPI_PROCESSOR=y
|
CONFIG_ACPI_PROCESSOR=y
|
||||||
CONFIG_ACPI_IPMI=m
|
CONFIG_ACPI_IPMI=m
|
||||||
CONFIG_ACPI_HOTPLUG_CPU=y
|
CONFIG_ACPI_HOTPLUG_CPU=y
|
||||||
|
|
@ -872,7 +889,6 @@ CONFIG_NET_IPVTI=m
|
||||||
CONFIG_NET_UDP_TUNNEL=m
|
CONFIG_NET_UDP_TUNNEL=m
|
||||||
CONFIG_NET_FOU=m
|
CONFIG_NET_FOU=m
|
||||||
CONFIG_NET_FOU_IP_TUNNELS=y
|
CONFIG_NET_FOU_IP_TUNNELS=y
|
||||||
CONFIG_GENEVE_CORE=m
|
|
||||||
CONFIG_INET_AH=m
|
CONFIG_INET_AH=m
|
||||||
CONFIG_INET_ESP=m
|
CONFIG_INET_ESP=m
|
||||||
CONFIG_INET_IPCOMP=m
|
CONFIG_INET_IPCOMP=m
|
||||||
|
|
@ -912,6 +928,7 @@ CONFIG_INET6_AH=m
|
||||||
CONFIG_INET6_ESP=m
|
CONFIG_INET6_ESP=m
|
||||||
CONFIG_INET6_IPCOMP=m
|
CONFIG_INET6_IPCOMP=m
|
||||||
CONFIG_IPV6_MIP6=m
|
CONFIG_IPV6_MIP6=m
|
||||||
|
CONFIG_IPV6_ILA=m
|
||||||
CONFIG_INET6_XFRM_TUNNEL=m
|
CONFIG_INET6_XFRM_TUNNEL=m
|
||||||
CONFIG_INET6_TUNNEL=m
|
CONFIG_INET6_TUNNEL=m
|
||||||
CONFIG_INET6_XFRM_MODE_TRANSPORT=m
|
CONFIG_INET6_XFRM_MODE_TRANSPORT=m
|
||||||
|
|
@ -1133,6 +1150,7 @@ CONFIG_IP_VS_WRR=m
|
||||||
CONFIG_IP_VS_LC=m
|
CONFIG_IP_VS_LC=m
|
||||||
CONFIG_IP_VS_WLC=m
|
CONFIG_IP_VS_WLC=m
|
||||||
CONFIG_IP_VS_FO=m
|
CONFIG_IP_VS_FO=m
|
||||||
|
CONFIG_IP_VS_OVF=m
|
||||||
CONFIG_IP_VS_LBLC=m
|
CONFIG_IP_VS_LBLC=m
|
||||||
CONFIG_IP_VS_LBLCR=m
|
CONFIG_IP_VS_LBLCR=m
|
||||||
CONFIG_IP_VS_DH=m
|
CONFIG_IP_VS_DH=m
|
||||||
|
|
@ -1160,7 +1178,9 @@ CONFIG_NF_CONNTRACK_IPV4=m
|
||||||
CONFIG_NF_TABLES_IPV4=m
|
CONFIG_NF_TABLES_IPV4=m
|
||||||
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
|
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
|
||||||
CONFIG_NFT_REJECT_IPV4=m
|
CONFIG_NFT_REJECT_IPV4=m
|
||||||
|
CONFIG_NFT_DUP_IPV4=m
|
||||||
CONFIG_NF_TABLES_ARP=m
|
CONFIG_NF_TABLES_ARP=m
|
||||||
|
CONFIG_NF_DUP_IPV4=m
|
||||||
CONFIG_NF_LOG_ARP=m
|
CONFIG_NF_LOG_ARP=m
|
||||||
CONFIG_NF_LOG_IPV4=m
|
CONFIG_NF_LOG_IPV4=m
|
||||||
CONFIG_NF_REJECT_IPV4=m
|
CONFIG_NF_REJECT_IPV4=m
|
||||||
|
|
@ -1203,6 +1223,8 @@ CONFIG_NF_CONNTRACK_IPV6=m
|
||||||
CONFIG_NF_TABLES_IPV6=m
|
CONFIG_NF_TABLES_IPV6=m
|
||||||
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
|
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
|
||||||
CONFIG_NFT_REJECT_IPV6=m
|
CONFIG_NFT_REJECT_IPV6=m
|
||||||
|
CONFIG_NFT_DUP_IPV6=m
|
||||||
|
CONFIG_NF_DUP_IPV6=m
|
||||||
CONFIG_NF_REJECT_IPV6=m
|
CONFIG_NF_REJECT_IPV6=m
|
||||||
CONFIG_NF_LOG_IPV6=m
|
CONFIG_NF_LOG_IPV6=m
|
||||||
CONFIG_NF_NAT_IPV6=m
|
CONFIG_NF_NAT_IPV6=m
|
||||||
|
|
@ -1433,6 +1455,7 @@ CONFIG_NETLINK_DIAG=m
|
||||||
CONFIG_MPLS=y
|
CONFIG_MPLS=y
|
||||||
CONFIG_NET_MPLS_GSO=m
|
CONFIG_NET_MPLS_GSO=m
|
||||||
CONFIG_MPLS_ROUTING=m
|
CONFIG_MPLS_ROUTING=m
|
||||||
|
CONFIG_MPLS_IPTUNNEL=m
|
||||||
CONFIG_HSR=m
|
CONFIG_HSR=m
|
||||||
# CONFIG_NET_SWITCHDEV is not set
|
# CONFIG_NET_SWITCHDEV is not set
|
||||||
CONFIG_RPS=y
|
CONFIG_RPS=y
|
||||||
|
|
@ -1591,6 +1614,7 @@ CONFIG_BT_BNEP_MC_FILTER=y
|
||||||
CONFIG_BT_BNEP_PROTO_FILTER=y
|
CONFIG_BT_BNEP_PROTO_FILTER=y
|
||||||
CONFIG_BT_CMTP=m
|
CONFIG_BT_CMTP=m
|
||||||
CONFIG_BT_HIDP=m
|
CONFIG_BT_HIDP=m
|
||||||
|
CONFIG_BT_HS=y
|
||||||
CONFIG_BT_LE=y
|
CONFIG_BT_LE=y
|
||||||
CONFIG_BT_6LOWPAN=m
|
CONFIG_BT_6LOWPAN=m
|
||||||
# CONFIG_BT_SELFTEST is not set
|
# CONFIG_BT_SELFTEST is not set
|
||||||
|
|
@ -1602,6 +1626,7 @@ CONFIG_BT_DEBUGFS=y
|
||||||
CONFIG_BT_INTEL=m
|
CONFIG_BT_INTEL=m
|
||||||
CONFIG_BT_BCM=m
|
CONFIG_BT_BCM=m
|
||||||
CONFIG_BT_RTL=m
|
CONFIG_BT_RTL=m
|
||||||
|
CONFIG_BT_QCA=m
|
||||||
CONFIG_BT_HCIBTUSB=m
|
CONFIG_BT_HCIBTUSB=m
|
||||||
CONFIG_BT_HCIBTUSB_BCM=y
|
CONFIG_BT_HCIBTUSB_BCM=y
|
||||||
CONFIG_BT_HCIBTUSB_RTL=y
|
CONFIG_BT_HCIBTUSB_RTL=y
|
||||||
|
|
@ -1614,6 +1639,7 @@ CONFIG_BT_HCIUART_LL=y
|
||||||
CONFIG_BT_HCIUART_3WIRE=y
|
CONFIG_BT_HCIUART_3WIRE=y
|
||||||
CONFIG_BT_HCIUART_INTEL=y
|
CONFIG_BT_HCIUART_INTEL=y
|
||||||
CONFIG_BT_HCIUART_BCM=y
|
CONFIG_BT_HCIUART_BCM=y
|
||||||
|
CONFIG_BT_HCIUART_QCA=y
|
||||||
CONFIG_BT_HCIBCM203X=m
|
CONFIG_BT_HCIBCM203X=m
|
||||||
CONFIG_BT_HCIBPA10X=m
|
CONFIG_BT_HCIBPA10X=m
|
||||||
CONFIG_BT_HCIBFUSB=m
|
CONFIG_BT_HCIBFUSB=m
|
||||||
|
|
@ -1712,8 +1738,12 @@ CONFIG_NFC_ST21NFCA=m
|
||||||
CONFIG_NFC_ST21NFCA_I2C=m
|
CONFIG_NFC_ST21NFCA_I2C=m
|
||||||
CONFIG_NFC_ST_NCI=m
|
CONFIG_NFC_ST_NCI=m
|
||||||
CONFIG_NFC_ST_NCI_I2C=m
|
CONFIG_NFC_ST_NCI_I2C=m
|
||||||
|
CONFIG_NFC_ST_NCI_SPI=m
|
||||||
CONFIG_NFC_NXP_NCI=m
|
CONFIG_NFC_NXP_NCI=m
|
||||||
CONFIG_NFC_NXP_NCI_I2C=m
|
CONFIG_NFC_NXP_NCI_I2C=m
|
||||||
|
CONFIG_NFC_S3FWRN5=m
|
||||||
|
CONFIG_NFC_S3FWRN5_I2C=m
|
||||||
|
CONFIG_LWTUNNEL=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Device Drivers
|
# Device Drivers
|
||||||
|
|
@ -2073,6 +2103,7 @@ CONFIG_VMWARE_VMCI=m
|
||||||
CONFIG_ECHO=m
|
CONFIG_ECHO=m
|
||||||
# CONFIG_CXL_BASE is not set
|
# CONFIG_CXL_BASE is not set
|
||||||
# CONFIG_CXL_KERNEL_API is not set
|
# CONFIG_CXL_KERNEL_API is not set
|
||||||
|
# CONFIG_CXL_EEH is not set
|
||||||
CONFIG_HAVE_IDE=y
|
CONFIG_HAVE_IDE=y
|
||||||
# CONFIG_IDE is not set
|
# CONFIG_IDE is not set
|
||||||
|
|
||||||
|
|
@ -2213,6 +2244,7 @@ CONFIG_SCSI_PAS16=m
|
||||||
CONFIG_SCSI_QLOGIC_FAS=m
|
CONFIG_SCSI_QLOGIC_FAS=m
|
||||||
CONFIG_SCSI_QLOGIC_1280=m
|
CONFIG_SCSI_QLOGIC_1280=m
|
||||||
CONFIG_SCSI_QLA_FC=m
|
CONFIG_SCSI_QLA_FC=m
|
||||||
|
CONFIG_TCM_QLA2XXX=m
|
||||||
CONFIG_SCSI_QLA_ISCSI=m
|
CONFIG_SCSI_QLA_ISCSI=m
|
||||||
CONFIG_SCSI_LPFC=m
|
CONFIG_SCSI_LPFC=m
|
||||||
# CONFIG_SCSI_LPFC_DEBUG_FS is not set
|
# CONFIG_SCSI_LPFC_DEBUG_FS is not set
|
||||||
|
|
@ -2240,7 +2272,7 @@ CONFIG_PCMCIA_FDOMAIN=m
|
||||||
CONFIG_PCMCIA_NINJA_SCSI=m
|
CONFIG_PCMCIA_NINJA_SCSI=m
|
||||||
CONFIG_PCMCIA_QLOGIC=m
|
CONFIG_PCMCIA_QLOGIC=m
|
||||||
CONFIG_PCMCIA_SYM53C500=m
|
CONFIG_PCMCIA_SYM53C500=m
|
||||||
CONFIG_SCSI_DH=m
|
CONFIG_SCSI_DH=y
|
||||||
CONFIG_SCSI_DH_RDAC=m
|
CONFIG_SCSI_DH_RDAC=m
|
||||||
CONFIG_SCSI_DH_HP_SW=m
|
CONFIG_SCSI_DH_HP_SW=m
|
||||||
CONFIG_SCSI_DH_EMC=m
|
CONFIG_SCSI_DH_EMC=m
|
||||||
|
|
@ -2454,6 +2486,7 @@ CONFIG_TUN=y
|
||||||
CONFIG_VETH=m
|
CONFIG_VETH=m
|
||||||
CONFIG_VIRTIO_NET=y
|
CONFIG_VIRTIO_NET=y
|
||||||
CONFIG_NLMON=m
|
CONFIG_NLMON=m
|
||||||
|
CONFIG_NET_VRF=m
|
||||||
CONFIG_SUNGEM_PHY=m
|
CONFIG_SUNGEM_PHY=m
|
||||||
CONFIG_ARCNET=m
|
CONFIG_ARCNET=m
|
||||||
CONFIG_ARCNET_1201=m
|
CONFIG_ARCNET_1201=m
|
||||||
|
|
@ -2560,9 +2593,10 @@ CONFIG_CNIC=m
|
||||||
CONFIG_TIGON3=m
|
CONFIG_TIGON3=m
|
||||||
CONFIG_BNX2X=m
|
CONFIG_BNX2X=m
|
||||||
CONFIG_BNX2X_SRIOV=y
|
CONFIG_BNX2X_SRIOV=y
|
||||||
|
CONFIG_BNX2X_VXLAN=y
|
||||||
CONFIG_NET_VENDOR_BROCADE=y
|
CONFIG_NET_VENDOR_BROCADE=y
|
||||||
CONFIG_BNA=m
|
CONFIG_BNA=m
|
||||||
CONFIG_NET_VENDOR_CAVIUM=m
|
CONFIG_NET_VENDOR_CAVIUM=y
|
||||||
CONFIG_NET_VENDOR_CHELSIO=y
|
CONFIG_NET_VENDOR_CHELSIO=y
|
||||||
CONFIG_CHELSIO_T1=m
|
CONFIG_CHELSIO_T1=m
|
||||||
CONFIG_CHELSIO_T1_1G=y
|
CONFIG_CHELSIO_T1_1G=y
|
||||||
|
|
@ -2614,13 +2648,11 @@ CONFIG_E1000=m
|
||||||
CONFIG_E1000E=m
|
CONFIG_E1000E=m
|
||||||
CONFIG_IGB=m
|
CONFIG_IGB=m
|
||||||
CONFIG_IGB_HWMON=y
|
CONFIG_IGB_HWMON=y
|
||||||
CONFIG_IGB_DCA=y
|
|
||||||
CONFIG_IGBVF=m
|
CONFIG_IGBVF=m
|
||||||
CONFIG_IXGB=m
|
CONFIG_IXGB=m
|
||||||
CONFIG_IXGBE=m
|
CONFIG_IXGBE=m
|
||||||
CONFIG_IXGBE_VXLAN=y
|
CONFIG_IXGBE_VXLAN=y
|
||||||
CONFIG_IXGBE_HWMON=y
|
CONFIG_IXGBE_HWMON=y
|
||||||
CONFIG_IXGBE_DCA=y
|
|
||||||
CONFIG_IXGBE_DCB=y
|
CONFIG_IXGBE_DCB=y
|
||||||
CONFIG_IXGBEVF=m
|
CONFIG_IXGBEVF=m
|
||||||
CONFIG_I40E=m
|
CONFIG_I40E=m
|
||||||
|
|
@ -2648,6 +2680,8 @@ CONFIG_MLX4_CORE=m
|
||||||
CONFIG_MLX4_DEBUG=y
|
CONFIG_MLX4_DEBUG=y
|
||||||
CONFIG_MLX5_CORE=m
|
CONFIG_MLX5_CORE=m
|
||||||
CONFIG_MLX5_CORE_EN=y
|
CONFIG_MLX5_CORE_EN=y
|
||||||
|
CONFIG_MLXSW_CORE=m
|
||||||
|
CONFIG_MLXSW_PCI=m
|
||||||
CONFIG_NET_VENDOR_MICREL=y
|
CONFIG_NET_VENDOR_MICREL=y
|
||||||
CONFIG_KS8842=m
|
CONFIG_KS8842=m
|
||||||
CONFIG_KS8851=m
|
CONFIG_KS8851=m
|
||||||
|
|
@ -2658,7 +2692,6 @@ CONFIG_ENC28J60=m
|
||||||
# CONFIG_ENC28J60_WRITEVERIFY is not set
|
# CONFIG_ENC28J60_WRITEVERIFY is not set
|
||||||
CONFIG_NET_VENDOR_MYRI=y
|
CONFIG_NET_VENDOR_MYRI=y
|
||||||
CONFIG_MYRI10GE=m
|
CONFIG_MYRI10GE=m
|
||||||
CONFIG_MYRI10GE_DCA=y
|
|
||||||
CONFIG_FEALNX=m
|
CONFIG_FEALNX=m
|
||||||
CONFIG_NET_VENDOR_NATSEMI=y
|
CONFIG_NET_VENDOR_NATSEMI=y
|
||||||
CONFIG_NATSEMI=m
|
CONFIG_NATSEMI=m
|
||||||
|
|
@ -2731,6 +2764,7 @@ CONFIG_HAPPYMEAL=m
|
||||||
CONFIG_SUNGEM=m
|
CONFIG_SUNGEM=m
|
||||||
CONFIG_CASSINI=m
|
CONFIG_CASSINI=m
|
||||||
CONFIG_NIU=m
|
CONFIG_NIU=m
|
||||||
|
CONFIG_NET_VENDOR_SYNOPSYS=y
|
||||||
CONFIG_NET_VENDOR_TEHUTI=y
|
CONFIG_NET_VENDOR_TEHUTI=y
|
||||||
CONFIG_TEHUTI=m
|
CONFIG_TEHUTI=m
|
||||||
CONFIG_NET_VENDOR_TI=y
|
CONFIG_NET_VENDOR_TI=y
|
||||||
|
|
@ -2759,6 +2793,7 @@ CONFIG_PHYLIB=y
|
||||||
#
|
#
|
||||||
# MII PHY device drivers
|
# MII PHY device drivers
|
||||||
#
|
#
|
||||||
|
CONFIG_AQUANTIA_PHY=m
|
||||||
CONFIG_AT803X_PHY=m
|
CONFIG_AT803X_PHY=m
|
||||||
CONFIG_AMD_PHY=m
|
CONFIG_AMD_PHY=m
|
||||||
CONFIG_MARVELL_PHY=m
|
CONFIG_MARVELL_PHY=m
|
||||||
|
|
@ -2767,6 +2802,7 @@ CONFIG_QSEMI_PHY=m
|
||||||
CONFIG_LXT_PHY=m
|
CONFIG_LXT_PHY=m
|
||||||
CONFIG_CICADA_PHY=m
|
CONFIG_CICADA_PHY=m
|
||||||
CONFIG_VITESSE_PHY=m
|
CONFIG_VITESSE_PHY=m
|
||||||
|
CONFIG_TERANETICS_PHY=m
|
||||||
CONFIG_SMSC_PHY=m
|
CONFIG_SMSC_PHY=m
|
||||||
CONFIG_BROADCOM_PHY=m
|
CONFIG_BROADCOM_PHY=m
|
||||||
CONFIG_BCM7XXX_PHY=m
|
CONFIG_BCM7XXX_PHY=m
|
||||||
|
|
@ -2777,7 +2813,9 @@ CONFIG_NATIONAL_PHY=m
|
||||||
CONFIG_STE10XP=m
|
CONFIG_STE10XP=m
|
||||||
CONFIG_LSI_ET1011C_PHY=m
|
CONFIG_LSI_ET1011C_PHY=m
|
||||||
CONFIG_MICREL_PHY=m
|
CONFIG_MICREL_PHY=m
|
||||||
|
# CONFIG_DP83848_PHY is not set
|
||||||
CONFIG_DP83867_PHY=m
|
CONFIG_DP83867_PHY=m
|
||||||
|
CONFIG_MICROCHIP_PHY=m
|
||||||
CONFIG_FIXED_PHY=y
|
CONFIG_FIXED_PHY=y
|
||||||
CONFIG_MDIO_BITBANG=m
|
CONFIG_MDIO_BITBANG=m
|
||||||
CONFIG_MDIO_GPIO=m
|
CONFIG_MDIO_GPIO=m
|
||||||
|
|
@ -2807,6 +2845,7 @@ CONFIG_USB_KAWETH=m
|
||||||
CONFIG_USB_PEGASUS=m
|
CONFIG_USB_PEGASUS=m
|
||||||
CONFIG_USB_RTL8150=m
|
CONFIG_USB_RTL8150=m
|
||||||
CONFIG_USB_RTL8152=m
|
CONFIG_USB_RTL8152=m
|
||||||
|
CONFIG_USB_LAN78XX=m
|
||||||
CONFIG_USB_USBNET=m
|
CONFIG_USB_USBNET=m
|
||||||
CONFIG_USB_NET_AX8817X=m
|
CONFIG_USB_NET_AX8817X=m
|
||||||
CONFIG_USB_NET_AX88179_178A=m
|
CONFIG_USB_NET_AX88179_178A=m
|
||||||
|
|
@ -2842,6 +2881,7 @@ CONFIG_USB_CDC_PHONET=m
|
||||||
CONFIG_USB_IPHETH=m
|
CONFIG_USB_IPHETH=m
|
||||||
CONFIG_USB_SIERRA_NET=m
|
CONFIG_USB_SIERRA_NET=m
|
||||||
CONFIG_USB_VL600=m
|
CONFIG_USB_VL600=m
|
||||||
|
CONFIG_USB_NET_CH9200=m
|
||||||
CONFIG_WLAN=y
|
CONFIG_WLAN=y
|
||||||
CONFIG_PCMCIA_RAYCS=m
|
CONFIG_PCMCIA_RAYCS=m
|
||||||
CONFIG_LIBERTAS_THINFIRM=m
|
CONFIG_LIBERTAS_THINFIRM=m
|
||||||
|
|
@ -3123,6 +3163,7 @@ CONFIG_IEEE802154_ATUSB=m
|
||||||
CONFIG_XEN_NETDEV_FRONTEND=y
|
CONFIG_XEN_NETDEV_FRONTEND=y
|
||||||
CONFIG_XEN_NETDEV_BACKEND=m
|
CONFIG_XEN_NETDEV_BACKEND=m
|
||||||
CONFIG_VMXNET3=m
|
CONFIG_VMXNET3=m
|
||||||
|
CONFIG_FUJITSU_ES=m
|
||||||
CONFIG_HYPERV_NET=m
|
CONFIG_HYPERV_NET=m
|
||||||
CONFIG_ISDN=y
|
CONFIG_ISDN=y
|
||||||
CONFIG_ISDN_I4L=m
|
CONFIG_ISDN_I4L=m
|
||||||
|
|
@ -3388,6 +3429,7 @@ CONFIG_TABLET_USB_HANWANG=m
|
||||||
CONFIG_TABLET_USB_KBTAB=m
|
CONFIG_TABLET_USB_KBTAB=m
|
||||||
CONFIG_TABLET_SERIAL_WACOM4=m
|
CONFIG_TABLET_SERIAL_WACOM4=m
|
||||||
CONFIG_INPUT_TOUCHSCREEN=y
|
CONFIG_INPUT_TOUCHSCREEN=y
|
||||||
|
CONFIG_TOUCHSCREEN_PROPERTIES=y
|
||||||
CONFIG_TOUCHSCREEN_88PM860X=m
|
CONFIG_TOUCHSCREEN_88PM860X=m
|
||||||
CONFIG_TOUCHSCREEN_ADS7846=m
|
CONFIG_TOUCHSCREEN_ADS7846=m
|
||||||
CONFIG_TOUCHSCREEN_AD7877=m
|
CONFIG_TOUCHSCREEN_AD7877=m
|
||||||
|
|
@ -3479,7 +3521,6 @@ CONFIG_INPUT_BMA150=m
|
||||||
CONFIG_INPUT_E3X0_BUTTON=m
|
CONFIG_INPUT_E3X0_BUTTON=m
|
||||||
CONFIG_INPUT_PCSPKR=m
|
CONFIG_INPUT_PCSPKR=m
|
||||||
CONFIG_INPUT_MAX77693_HAPTIC=m
|
CONFIG_INPUT_MAX77693_HAPTIC=m
|
||||||
CONFIG_INPUT_MAX77843_HAPTIC=m
|
|
||||||
CONFIG_INPUT_MAX8925_ONKEY=m
|
CONFIG_INPUT_MAX8925_ONKEY=m
|
||||||
CONFIG_INPUT_MAX8997_HAPTIC=m
|
CONFIG_INPUT_MAX8997_HAPTIC=m
|
||||||
CONFIG_INPUT_MC13783_PWRBUTTON=m
|
CONFIG_INPUT_MC13783_PWRBUTTON=m
|
||||||
|
|
@ -3722,6 +3763,7 @@ CONFIG_I2C_MUX_GPIO=m
|
||||||
CONFIG_I2C_MUX_PCA9541=m
|
CONFIG_I2C_MUX_PCA9541=m
|
||||||
CONFIG_I2C_MUX_PCA954x=m
|
CONFIG_I2C_MUX_PCA954x=m
|
||||||
CONFIG_I2C_MUX_PINCTRL=m
|
CONFIG_I2C_MUX_PINCTRL=m
|
||||||
|
CONFIG_I2C_MUX_REG=m
|
||||||
CONFIG_I2C_HELPER_AUTO=y
|
CONFIG_I2C_HELPER_AUTO=y
|
||||||
CONFIG_I2C_SMBUS=m
|
CONFIG_I2C_SMBUS=m
|
||||||
CONFIG_I2C_ALGOBIT=m
|
CONFIG_I2C_ALGOBIT=m
|
||||||
|
|
@ -3765,6 +3807,7 @@ CONFIG_I2C_DESIGNWARE_CORE=m
|
||||||
CONFIG_I2C_DESIGNWARE_PLATFORM=m
|
CONFIG_I2C_DESIGNWARE_PLATFORM=m
|
||||||
CONFIG_I2C_DESIGNWARE_PCI=m
|
CONFIG_I2C_DESIGNWARE_PCI=m
|
||||||
CONFIG_I2C_EG20T=m
|
CONFIG_I2C_EG20T=m
|
||||||
|
CONFIG_I2C_EMEV2=m
|
||||||
CONFIG_I2C_GPIO=m
|
CONFIG_I2C_GPIO=m
|
||||||
CONFIG_I2C_KEMPLD=m
|
CONFIG_I2C_KEMPLD=m
|
||||||
CONFIG_I2C_OCORES=m
|
CONFIG_I2C_OCORES=m
|
||||||
|
|
@ -3958,6 +4001,7 @@ CONFIG_GPIO_RDC321X=m
|
||||||
CONFIG_GPIO_MAX7301=m
|
CONFIG_GPIO_MAX7301=m
|
||||||
CONFIG_GPIO_MCP23S08=m
|
CONFIG_GPIO_MCP23S08=m
|
||||||
CONFIG_GPIO_MC33880=m
|
CONFIG_GPIO_MC33880=m
|
||||||
|
CONFIG_GPIO_ZX=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# USB GPIO expanders
|
# USB GPIO expanders
|
||||||
|
|
@ -4156,6 +4200,7 @@ CONFIG_SENSORS_LM25066=m
|
||||||
CONFIG_SENSORS_LTC2978=m
|
CONFIG_SENSORS_LTC2978=m
|
||||||
CONFIG_SENSORS_LTC2978_REGULATOR=y
|
CONFIG_SENSORS_LTC2978_REGULATOR=y
|
||||||
CONFIG_SENSORS_MAX16064=m
|
CONFIG_SENSORS_MAX16064=m
|
||||||
|
CONFIG_SENSORS_MAX20751=m
|
||||||
CONFIG_SENSORS_MAX34440=m
|
CONFIG_SENSORS_MAX34440=m
|
||||||
CONFIG_SENSORS_MAX8688=m
|
CONFIG_SENSORS_MAX8688=m
|
||||||
CONFIG_SENSORS_TPS40422=m
|
CONFIG_SENSORS_TPS40422=m
|
||||||
|
|
@ -4232,10 +4277,7 @@ CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
|
||||||
CONFIG_INTEL_SOC_DTS_THERMAL=m
|
CONFIG_INTEL_SOC_DTS_THERMAL=m
|
||||||
CONFIG_INT340X_THERMAL=m
|
CONFIG_INT340X_THERMAL=m
|
||||||
CONFIG_ACPI_THERMAL_REL=m
|
CONFIG_ACPI_THERMAL_REL=m
|
||||||
|
CONFIG_INTEL_PCH_THERMAL=m
|
||||||
#
|
|
||||||
# Texas Instruments thermal drivers
|
|
||||||
#
|
|
||||||
CONFIG_WATCHDOG=y
|
CONFIG_WATCHDOG=y
|
||||||
CONFIG_WATCHDOG_CORE=y
|
CONFIG_WATCHDOG_CORE=y
|
||||||
# CONFIG_WATCHDOG_NOWAYOUT is not set
|
# CONFIG_WATCHDOG_NOWAYOUT is not set
|
||||||
|
|
@ -4247,6 +4289,7 @@ CONFIG_SOFT_WATCHDOG=m
|
||||||
CONFIG_DA9052_WATCHDOG=m
|
CONFIG_DA9052_WATCHDOG=m
|
||||||
CONFIG_DA9055_WATCHDOG=m
|
CONFIG_DA9055_WATCHDOG=m
|
||||||
CONFIG_DA9063_WATCHDOG=m
|
CONFIG_DA9063_WATCHDOG=m
|
||||||
|
CONFIG_DA9062_WATCHDOG=m
|
||||||
CONFIG_MENF21BMC_WATCHDOG=m
|
CONFIG_MENF21BMC_WATCHDOG=m
|
||||||
CONFIG_WM831X_WATCHDOG=m
|
CONFIG_WM831X_WATCHDOG=m
|
||||||
CONFIG_WM8350_WATCHDOG=m
|
CONFIG_WM8350_WATCHDOG=m
|
||||||
|
|
@ -4368,6 +4411,7 @@ CONFIG_PMIC_DA9052=y
|
||||||
CONFIG_MFD_DA9052_SPI=y
|
CONFIG_MFD_DA9052_SPI=y
|
||||||
CONFIG_MFD_DA9052_I2C=y
|
CONFIG_MFD_DA9052_I2C=y
|
||||||
CONFIG_MFD_DA9055=y
|
CONFIG_MFD_DA9055=y
|
||||||
|
CONFIG_MFD_DA9062=m
|
||||||
CONFIG_MFD_DA9063=y
|
CONFIG_MFD_DA9063=y
|
||||||
CONFIG_MFD_DA9150=m
|
CONFIG_MFD_DA9150=m
|
||||||
CONFIG_MFD_DLN2=m
|
CONFIG_MFD_DLN2=m
|
||||||
|
|
@ -4380,6 +4424,9 @@ CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
|
||||||
CONFIG_LPC_ICH=m
|
CONFIG_LPC_ICH=m
|
||||||
CONFIG_LPC_SCH=m
|
CONFIG_LPC_SCH=m
|
||||||
CONFIG_INTEL_SOC_PMIC=y
|
CONFIG_INTEL_SOC_PMIC=y
|
||||||
|
CONFIG_MFD_INTEL_LPSS=m
|
||||||
|
CONFIG_MFD_INTEL_LPSS_ACPI=m
|
||||||
|
CONFIG_MFD_INTEL_LPSS_PCI=m
|
||||||
CONFIG_MFD_INTEL_MSIC=y
|
CONFIG_MFD_INTEL_MSIC=y
|
||||||
CONFIG_MFD_JANZ_CMODIO=m
|
CONFIG_MFD_JANZ_CMODIO=m
|
||||||
CONFIG_MFD_KEMPLD=m
|
CONFIG_MFD_KEMPLD=m
|
||||||
|
|
@ -4448,6 +4495,7 @@ CONFIG_MFD_ARIZONA_SPI=m
|
||||||
CONFIG_MFD_WM5102=y
|
CONFIG_MFD_WM5102=y
|
||||||
CONFIG_MFD_WM5110=y
|
CONFIG_MFD_WM5110=y
|
||||||
CONFIG_MFD_WM8997=y
|
CONFIG_MFD_WM8997=y
|
||||||
|
CONFIG_MFD_WM8998=y
|
||||||
CONFIG_MFD_WM8400=y
|
CONFIG_MFD_WM8400=y
|
||||||
CONFIG_MFD_WM831X=y
|
CONFIG_MFD_WM831X=y
|
||||||
CONFIG_MFD_WM831X_I2C=y
|
CONFIG_MFD_WM831X_I2C=y
|
||||||
|
|
@ -4474,6 +4522,7 @@ CONFIG_REGULATOR_BCM590XX=m
|
||||||
CONFIG_REGULATOR_DA903X=m
|
CONFIG_REGULATOR_DA903X=m
|
||||||
CONFIG_REGULATOR_DA9052=m
|
CONFIG_REGULATOR_DA9052=m
|
||||||
CONFIG_REGULATOR_DA9055=m
|
CONFIG_REGULATOR_DA9055=m
|
||||||
|
CONFIG_REGULATOR_DA9062=m
|
||||||
CONFIG_REGULATOR_DA9063=m
|
CONFIG_REGULATOR_DA9063=m
|
||||||
CONFIG_REGULATOR_DA9210=m
|
CONFIG_REGULATOR_DA9210=m
|
||||||
CONFIG_REGULATOR_DA9211=m
|
CONFIG_REGULATOR_DA9211=m
|
||||||
|
|
@ -4498,10 +4547,10 @@ CONFIG_REGULATOR_MAX8973=m
|
||||||
CONFIG_REGULATOR_MAX8997=m
|
CONFIG_REGULATOR_MAX8997=m
|
||||||
CONFIG_REGULATOR_MAX8998=m
|
CONFIG_REGULATOR_MAX8998=m
|
||||||
CONFIG_REGULATOR_MAX77693=m
|
CONFIG_REGULATOR_MAX77693=m
|
||||||
CONFIG_REGULATOR_MAX77843=m
|
|
||||||
CONFIG_REGULATOR_MC13XXX_CORE=m
|
CONFIG_REGULATOR_MC13XXX_CORE=m
|
||||||
CONFIG_REGULATOR_MC13783=m
|
CONFIG_REGULATOR_MC13783=m
|
||||||
CONFIG_REGULATOR_MC13892=m
|
CONFIG_REGULATOR_MC13892=m
|
||||||
|
CONFIG_REGULATOR_MT6311=m
|
||||||
CONFIG_REGULATOR_MT6397=m
|
CONFIG_REGULATOR_MT6397=m
|
||||||
CONFIG_REGULATOR_PALMAS=m
|
CONFIG_REGULATOR_PALMAS=m
|
||||||
CONFIG_REGULATOR_PCAP=m
|
CONFIG_REGULATOR_PCAP=m
|
||||||
|
|
@ -4772,13 +4821,8 @@ CONFIG_MEDIA_PCI_SUPPORT=y
|
||||||
# Media capture support
|
# Media capture support
|
||||||
#
|
#
|
||||||
CONFIG_VIDEO_MEYE=m
|
CONFIG_VIDEO_MEYE=m
|
||||||
|
CONFIG_VIDEO_SOLO6X10=m
|
||||||
#
|
CONFIG_VIDEO_TW68=m
|
||||||
# Media capture/analog TV support
|
|
||||||
#
|
|
||||||
CONFIG_VIDEO_IVTV=m
|
|
||||||
CONFIG_VIDEO_IVTV_ALSA=m
|
|
||||||
CONFIG_VIDEO_FB_IVTV=m
|
|
||||||
CONFIG_VIDEO_ZORAN=m
|
CONFIG_VIDEO_ZORAN=m
|
||||||
CONFIG_VIDEO_ZORAN_DC30=m
|
CONFIG_VIDEO_ZORAN_DC30=m
|
||||||
CONFIG_VIDEO_ZORAN_ZR36060=m
|
CONFIG_VIDEO_ZORAN_ZR36060=m
|
||||||
|
|
@ -4787,11 +4831,16 @@ CONFIG_VIDEO_ZORAN_DC10=m
|
||||||
CONFIG_VIDEO_ZORAN_LML33=m
|
CONFIG_VIDEO_ZORAN_LML33=m
|
||||||
CONFIG_VIDEO_ZORAN_LML33R10=m
|
CONFIG_VIDEO_ZORAN_LML33R10=m
|
||||||
CONFIG_VIDEO_ZORAN_AVS6EYES=m
|
CONFIG_VIDEO_ZORAN_AVS6EYES=m
|
||||||
|
|
||||||
|
#
|
||||||
|
# Media capture/analog TV support
|
||||||
|
#
|
||||||
|
CONFIG_VIDEO_IVTV=m
|
||||||
|
CONFIG_VIDEO_IVTV_ALSA=m
|
||||||
|
CONFIG_VIDEO_FB_IVTV=m
|
||||||
CONFIG_VIDEO_HEXIUM_GEMINI=m
|
CONFIG_VIDEO_HEXIUM_GEMINI=m
|
||||||
CONFIG_VIDEO_HEXIUM_ORION=m
|
CONFIG_VIDEO_HEXIUM_ORION=m
|
||||||
CONFIG_VIDEO_MXB=m
|
CONFIG_VIDEO_MXB=m
|
||||||
CONFIG_VIDEO_SOLO6X10=m
|
|
||||||
CONFIG_VIDEO_TW68=m
|
|
||||||
CONFIG_VIDEO_DT3155=m
|
CONFIG_VIDEO_DT3155=m
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -4843,6 +4892,7 @@ CONFIG_DVB_HOPPER=m
|
||||||
CONFIG_DVB_NGENE=m
|
CONFIG_DVB_NGENE=m
|
||||||
CONFIG_DVB_DDBRIDGE=m
|
CONFIG_DVB_DDBRIDGE=m
|
||||||
CONFIG_DVB_SMIPCIE=m
|
CONFIG_DVB_SMIPCIE=m
|
||||||
|
CONFIG_DVB_NETUP_UNIDVB=m
|
||||||
CONFIG_V4L_PLATFORM_DRIVERS=y
|
CONFIG_V4L_PLATFORM_DRIVERS=y
|
||||||
CONFIG_VIDEO_CAFE_CCIC=m
|
CONFIG_VIDEO_CAFE_CCIC=m
|
||||||
CONFIG_VIDEO_VIA_CAMERA=m
|
CONFIG_VIDEO_VIA_CAMERA=m
|
||||||
|
|
@ -4855,6 +4905,7 @@ CONFIG_VIDEO_SH_VEU=m
|
||||||
CONFIG_V4L_TEST_DRIVERS=y
|
CONFIG_V4L_TEST_DRIVERS=y
|
||||||
CONFIG_VIDEO_VIVID=m
|
CONFIG_VIDEO_VIVID=m
|
||||||
CONFIG_VIDEO_VIM2M=m
|
CONFIG_VIDEO_VIM2M=m
|
||||||
|
CONFIG_DVB_PLATFORM_DRIVERS=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Supported MMC/SDIO adapters
|
# Supported MMC/SDIO adapters
|
||||||
|
|
@ -5139,6 +5190,7 @@ CONFIG_DVB_AF9013=m
|
||||||
CONFIG_DVB_EC100=m
|
CONFIG_DVB_EC100=m
|
||||||
CONFIG_DVB_STV0367=m
|
CONFIG_DVB_STV0367=m
|
||||||
CONFIG_DVB_CXD2820R=m
|
CONFIG_DVB_CXD2820R=m
|
||||||
|
CONFIG_DVB_CXD2841ER=m
|
||||||
CONFIG_DVB_RTL2830=m
|
CONFIG_DVB_RTL2830=m
|
||||||
CONFIG_DVB_RTL2832=m
|
CONFIG_DVB_RTL2832=m
|
||||||
CONFIG_DVB_RTL2832_SDR=m
|
CONFIG_DVB_RTL2832_SDR=m
|
||||||
|
|
@ -5193,6 +5245,7 @@ CONFIG_DVB_TUNER_DIB0090=m
|
||||||
# SEC control devices for DVB-S
|
# SEC control devices for DVB-S
|
||||||
#
|
#
|
||||||
CONFIG_DVB_DRX39XYJ=m
|
CONFIG_DVB_DRX39XYJ=m
|
||||||
|
CONFIG_DVB_LNBH25=m
|
||||||
CONFIG_DVB_LNBP21=m
|
CONFIG_DVB_LNBP21=m
|
||||||
CONFIG_DVB_LNBP22=m
|
CONFIG_DVB_LNBP22=m
|
||||||
CONFIG_DVB_ISL6405=m
|
CONFIG_DVB_ISL6405=m
|
||||||
|
|
@ -5206,6 +5259,8 @@ CONFIG_DVB_TDA665x=m
|
||||||
CONFIG_DVB_IX2505V=m
|
CONFIG_DVB_IX2505V=m
|
||||||
CONFIG_DVB_M88RS2000=m
|
CONFIG_DVB_M88RS2000=m
|
||||||
CONFIG_DVB_AF9033=m
|
CONFIG_DVB_AF9033=m
|
||||||
|
CONFIG_DVB_HORUS3A=m
|
||||||
|
CONFIG_DVB_ASCOT2E=m
|
||||||
|
|
||||||
#
|
#
|
||||||
# Tools to develop new frontends
|
# Tools to develop new frontends
|
||||||
|
|
@ -5230,14 +5285,11 @@ CONFIG_INTEL_GTT=y
|
||||||
CONFIG_VGA_ARB=y
|
CONFIG_VGA_ARB=y
|
||||||
CONFIG_VGA_ARB_MAX_GPUS=16
|
CONFIG_VGA_ARB_MAX_GPUS=16
|
||||||
CONFIG_VGA_SWITCHEROO=y
|
CONFIG_VGA_SWITCHEROO=y
|
||||||
|
|
||||||
#
|
|
||||||
# Direct Rendering Manager
|
|
||||||
#
|
|
||||||
CONFIG_DRM=m
|
CONFIG_DRM=m
|
||||||
CONFIG_DRM_MIPI_DSI=y
|
CONFIG_DRM_MIPI_DSI=y
|
||||||
CONFIG_DRM_KMS_HELPER=m
|
CONFIG_DRM_KMS_HELPER=m
|
||||||
CONFIG_DRM_KMS_FB_HELPER=y
|
CONFIG_DRM_KMS_FB_HELPER=y
|
||||||
|
CONFIG_DRM_FBDEV_EMULATION=y
|
||||||
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
|
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
|
||||||
CONFIG_DRM_TTM=m
|
CONFIG_DRM_TTM=m
|
||||||
|
|
||||||
|
|
@ -5262,8 +5314,6 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
|
||||||
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
|
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
|
||||||
CONFIG_DRM_I810=m
|
CONFIG_DRM_I810=m
|
||||||
CONFIG_DRM_I915=m
|
CONFIG_DRM_I915=m
|
||||||
CONFIG_DRM_I915_KMS=y
|
|
||||||
CONFIG_DRM_I915_FBDEV=y
|
|
||||||
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
|
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
|
||||||
CONFIG_DRM_MGA=m
|
CONFIG_DRM_MGA=m
|
||||||
CONFIG_DRM_SIS=m
|
CONFIG_DRM_SIS=m
|
||||||
|
|
@ -5288,6 +5338,11 @@ CONFIG_DRM_PANEL=y
|
||||||
#
|
#
|
||||||
# Display Panels
|
# Display Panels
|
||||||
#
|
#
|
||||||
|
CONFIG_DRM_BRIDGE=y
|
||||||
|
|
||||||
|
#
|
||||||
|
# Display Interface Bridges
|
||||||
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
# Frame buffer Devices
|
# Frame buffer Devices
|
||||||
|
|
@ -5406,6 +5461,7 @@ CONFIG_FB_AUO_K1900=m
|
||||||
CONFIG_FB_AUO_K1901=m
|
CONFIG_FB_AUO_K1901=m
|
||||||
CONFIG_FB_HYPERV=m
|
CONFIG_FB_HYPERV=m
|
||||||
CONFIG_FB_SIMPLE=y
|
CONFIG_FB_SIMPLE=y
|
||||||
|
CONFIG_FB_SM712=m
|
||||||
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
||||||
CONFIG_LCD_CLASS_DEVICE=m
|
CONFIG_LCD_CLASS_DEVICE=m
|
||||||
CONFIG_LCD_L4F00242T03=m
|
CONFIG_LCD_L4F00242T03=m
|
||||||
|
|
@ -5430,6 +5486,7 @@ CONFIG_BACKLIGHT_DA903X=m
|
||||||
CONFIG_BACKLIGHT_DA9052=m
|
CONFIG_BACKLIGHT_DA9052=m
|
||||||
CONFIG_BACKLIGHT_MAX8925=m
|
CONFIG_BACKLIGHT_MAX8925=m
|
||||||
CONFIG_BACKLIGHT_APPLE=m
|
CONFIG_BACKLIGHT_APPLE=m
|
||||||
|
CONFIG_BACKLIGHT_PM8941_WLED=m
|
||||||
CONFIG_BACKLIGHT_SAHARA=m
|
CONFIG_BACKLIGHT_SAHARA=m
|
||||||
CONFIG_BACKLIGHT_WM831X=m
|
CONFIG_BACKLIGHT_WM831X=m
|
||||||
CONFIG_BACKLIGHT_ADP5520=m
|
CONFIG_BACKLIGHT_ADP5520=m
|
||||||
|
|
@ -5724,7 +5781,6 @@ CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
|
||||||
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
|
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
|
||||||
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
|
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
|
||||||
CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
|
CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
|
||||||
CONFIG_SND_SOC_QCOM=m
|
|
||||||
CONFIG_SND_SOC_XTFPGA_I2S=m
|
CONFIG_SND_SOC_XTFPGA_I2S=m
|
||||||
CONFIG_SND_SOC_I2C_AND_SPI=m
|
CONFIG_SND_SOC_I2C_AND_SPI=m
|
||||||
|
|
||||||
|
|
@ -5751,8 +5807,10 @@ CONFIG_SND_SOC_CS4271_I2C=m
|
||||||
CONFIG_SND_SOC_CS4271_SPI=m
|
CONFIG_SND_SOC_CS4271_SPI=m
|
||||||
CONFIG_SND_SOC_CS42XX8=m
|
CONFIG_SND_SOC_CS42XX8=m
|
||||||
CONFIG_SND_SOC_CS42XX8_I2C=m
|
CONFIG_SND_SOC_CS42XX8_I2C=m
|
||||||
|
CONFIG_SND_SOC_CS4349=m
|
||||||
CONFIG_SND_SOC_HDMI_CODEC=m
|
CONFIG_SND_SOC_HDMI_CODEC=m
|
||||||
CONFIG_SND_SOC_ES8328=m
|
CONFIG_SND_SOC_ES8328=m
|
||||||
|
CONFIG_SND_SOC_GTM601=m
|
||||||
CONFIG_SND_SOC_MAX98090=m
|
CONFIG_SND_SOC_MAX98090=m
|
||||||
CONFIG_SND_SOC_PCM1681=m
|
CONFIG_SND_SOC_PCM1681=m
|
||||||
CONFIG_SND_SOC_PCM1792A=m
|
CONFIG_SND_SOC_PCM1792A=m
|
||||||
|
|
@ -5780,6 +5838,7 @@ CONFIG_SND_SOC_SSM2602_I2C=m
|
||||||
CONFIG_SND_SOC_SSM4567=m
|
CONFIG_SND_SOC_SSM4567=m
|
||||||
CONFIG_SND_SOC_STA32X=m
|
CONFIG_SND_SOC_STA32X=m
|
||||||
CONFIG_SND_SOC_STA350=m
|
CONFIG_SND_SOC_STA350=m
|
||||||
|
CONFIG_SND_SOC_STI_SAS=m
|
||||||
CONFIG_SND_SOC_TAS2552=m
|
CONFIG_SND_SOC_TAS2552=m
|
||||||
CONFIG_SND_SOC_TAS5086=m
|
CONFIG_SND_SOC_TAS5086=m
|
||||||
CONFIG_SND_SOC_TAS571X=m
|
CONFIG_SND_SOC_TAS571X=m
|
||||||
|
|
@ -5844,6 +5903,7 @@ CONFIG_HID_EMS_FF=m
|
||||||
CONFIG_HID_ELECOM=m
|
CONFIG_HID_ELECOM=m
|
||||||
CONFIG_HID_ELO=m
|
CONFIG_HID_ELO=m
|
||||||
CONFIG_HID_EZKEY=m
|
CONFIG_HID_EZKEY=m
|
||||||
|
CONFIG_HID_GEMBIRD=m
|
||||||
CONFIG_HID_HOLTEK=m
|
CONFIG_HID_HOLTEK=m
|
||||||
CONFIG_HOLTEK_FF=y
|
CONFIG_HOLTEK_FF=y
|
||||||
CONFIG_HID_GT683R=m
|
CONFIG_HID_GT683R=m
|
||||||
|
|
@ -6032,6 +6092,10 @@ CONFIG_USB_MUSB_DUAL_ROLE=y
|
||||||
#
|
#
|
||||||
# Platform Glue Layer
|
# Platform Glue Layer
|
||||||
#
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# MUSB DMA mode
|
||||||
|
#
|
||||||
CONFIG_MUSB_PIO_ONLY=y
|
CONFIG_MUSB_PIO_ONLY=y
|
||||||
CONFIG_USB_DWC3=m
|
CONFIG_USB_DWC3=m
|
||||||
CONFIG_USB_DWC3_ULPI=y
|
CONFIG_USB_DWC3_ULPI=y
|
||||||
|
|
@ -6043,11 +6107,6 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
|
||||||
# Platform Glue Driver Support
|
# Platform Glue Driver Support
|
||||||
#
|
#
|
||||||
CONFIG_USB_DWC3_PCI=m
|
CONFIG_USB_DWC3_PCI=m
|
||||||
|
|
||||||
#
|
|
||||||
# Debugging features
|
|
||||||
#
|
|
||||||
# CONFIG_USB_DWC3_DEBUG is not set
|
|
||||||
CONFIG_USB_DWC2=y
|
CONFIG_USB_DWC2=y
|
||||||
CONFIG_USB_DWC2_HOST=y
|
CONFIG_USB_DWC2_HOST=y
|
||||||
|
|
||||||
|
|
@ -6386,7 +6445,6 @@ CONFIG_LEDS_MENF21BMC=m
|
||||||
# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
|
# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
|
||||||
#
|
#
|
||||||
CONFIG_LEDS_BLINKM=m
|
CONFIG_LEDS_BLINKM=m
|
||||||
CONFIG_LEDS_PM8941_WLED=m
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# LED Triggers
|
# LED Triggers
|
||||||
|
|
@ -6414,8 +6472,6 @@ CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
|
||||||
CONFIG_INFINIBAND_ADDR_TRANS=y
|
CONFIG_INFINIBAND_ADDR_TRANS=y
|
||||||
CONFIG_INFINIBAND_MTHCA=m
|
CONFIG_INFINIBAND_MTHCA=m
|
||||||
# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
|
# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
|
||||||
CONFIG_INFINIBAND_AMSO1100=m
|
|
||||||
# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
|
|
||||||
CONFIG_INFINIBAND_CXGB3=m
|
CONFIG_INFINIBAND_CXGB3=m
|
||||||
# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
|
# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
|
||||||
CONFIG_INFINIBAND_CXGB4=m
|
CONFIG_INFINIBAND_CXGB4=m
|
||||||
|
|
@ -6438,7 +6494,6 @@ CONFIG_EDAC=y
|
||||||
# CONFIG_EDAC_LEGACY_SYSFS is not set
|
# CONFIG_EDAC_LEGACY_SYSFS is not set
|
||||||
# CONFIG_EDAC_DEBUG is not set
|
# CONFIG_EDAC_DEBUG is not set
|
||||||
CONFIG_EDAC_DECODE_MCE=m
|
CONFIG_EDAC_DECODE_MCE=m
|
||||||
CONFIG_EDAC_MCE_INJ=m
|
|
||||||
CONFIG_EDAC_MM_EDAC=m
|
CONFIG_EDAC_MM_EDAC=m
|
||||||
CONFIG_EDAC_AMD64=m
|
CONFIG_EDAC_AMD64=m
|
||||||
# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
|
# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
|
||||||
|
|
@ -6588,25 +6643,23 @@ CONFIG_DMADEVICES=y
|
||||||
#
|
#
|
||||||
# DMA Devices
|
# DMA Devices
|
||||||
#
|
#
|
||||||
CONFIG_INTEL_IOATDMA=m
|
CONFIG_DMA_ENGINE=y
|
||||||
|
CONFIG_DMA_VIRTUAL_CHANNELS=m
|
||||||
|
CONFIG_DMA_ACPI=y
|
||||||
|
CONFIG_IDMA64=m
|
||||||
|
CONFIG_PCH_DMA=m
|
||||||
|
CONFIG_TIMB_DMA=m
|
||||||
CONFIG_DW_DMAC_CORE=m
|
CONFIG_DW_DMAC_CORE=m
|
||||||
CONFIG_DW_DMAC=m
|
CONFIG_DW_DMAC=m
|
||||||
CONFIG_DW_DMAC_PCI=m
|
CONFIG_DW_DMAC_PCI=m
|
||||||
CONFIG_HSU_DMA=m
|
CONFIG_HSU_DMA=m
|
||||||
CONFIG_HSU_DMA_PCI=m
|
CONFIG_HSU_DMA_PCI=m
|
||||||
CONFIG_TIMB_DMA=m
|
|
||||||
CONFIG_PCH_DMA=m
|
|
||||||
CONFIG_DMA_ENGINE=y
|
|
||||||
CONFIG_DMA_VIRTUAL_CHANNELS=m
|
|
||||||
CONFIG_DMA_ACPI=y
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# DMA Clients
|
# DMA Clients
|
||||||
#
|
#
|
||||||
CONFIG_ASYNC_TX_DMA=y
|
CONFIG_ASYNC_TX_DMA=y
|
||||||
# CONFIG_DMATEST is not set
|
# CONFIG_DMATEST is not set
|
||||||
CONFIG_DMA_ENGINE_RAID=y
|
|
||||||
CONFIG_DCA=m
|
|
||||||
CONFIG_AUXDISPLAY=y
|
CONFIG_AUXDISPLAY=y
|
||||||
CONFIG_KS0108=m
|
CONFIG_KS0108=m
|
||||||
CONFIG_KS0108_PORT=0x378
|
CONFIG_KS0108_PORT=0x378
|
||||||
|
|
@ -6675,6 +6728,8 @@ CONFIG_XEN_ACPI_PROCESSOR=y
|
||||||
CONFIG_XEN_HAVE_PVMMU=y
|
CONFIG_XEN_HAVE_PVMMU=y
|
||||||
CONFIG_XEN_AUTO_XLATE=y
|
CONFIG_XEN_AUTO_XLATE=y
|
||||||
CONFIG_XEN_ACPI=y
|
CONFIG_XEN_ACPI=y
|
||||||
|
CONFIG_XEN_SYMS=y
|
||||||
|
CONFIG_XEN_HAVE_VPMU=y
|
||||||
CONFIG_STAGING=y
|
CONFIG_STAGING=y
|
||||||
CONFIG_SLICOSS=m
|
CONFIG_SLICOSS=m
|
||||||
CONFIG_PRISM2_USB=m
|
CONFIG_PRISM2_USB=m
|
||||||
|
|
@ -6933,7 +6988,6 @@ CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
|
||||||
CONFIG_IIO_SIMPLE_DUMMY=m
|
CONFIG_IIO_SIMPLE_DUMMY=m
|
||||||
# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
|
# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
|
||||||
# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
|
# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
|
||||||
CONFIG_FB_SM7XX=m
|
|
||||||
CONFIG_FB_SM750=m
|
CONFIG_FB_SM750=m
|
||||||
CONFIG_FB_XGI=m
|
CONFIG_FB_XGI=m
|
||||||
CONFIG_FT1000=m
|
CONFIG_FT1000=m
|
||||||
|
|
@ -6974,11 +7028,13 @@ CONFIG_LIRC_SERIAL=m
|
||||||
CONFIG_LIRC_SERIAL_TRANSMITTER=y
|
CONFIG_LIRC_SERIAL_TRANSMITTER=y
|
||||||
CONFIG_LIRC_SIR=m
|
CONFIG_LIRC_SIR=m
|
||||||
CONFIG_LIRC_ZILOG=m
|
CONFIG_LIRC_ZILOG=m
|
||||||
|
CONFIG_STAGING_RDMA=y
|
||||||
|
CONFIG_INFINIBAND_AMSO1100=m
|
||||||
|
# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Android
|
# Android
|
||||||
#
|
#
|
||||||
CONFIG_USB_WPAN_HCD=m
|
|
||||||
CONFIG_WIMAX_GDM72XX=m
|
CONFIG_WIMAX_GDM72XX=m
|
||||||
CONFIG_WIMAX_GDM72XX_QOS=y
|
CONFIG_WIMAX_GDM72XX_QOS=y
|
||||||
CONFIG_WIMAX_GDM72XX_K_MODE=y
|
CONFIG_WIMAX_GDM72XX_K_MODE=y
|
||||||
|
|
@ -7028,11 +7084,21 @@ CONFIG_FB_TFT_SSD1351=m
|
||||||
CONFIG_FB_TFT_ST7735R=m
|
CONFIG_FB_TFT_ST7735R=m
|
||||||
CONFIG_FB_TFT_TINYLCD=m
|
CONFIG_FB_TFT_TINYLCD=m
|
||||||
CONFIG_FB_TFT_TLS8204=m
|
CONFIG_FB_TFT_TLS8204=m
|
||||||
|
CONFIG_FB_TFT_UC1611=m
|
||||||
CONFIG_FB_TFT_UC1701=m
|
CONFIG_FB_TFT_UC1701=m
|
||||||
CONFIG_FB_TFT_UPD161704=m
|
CONFIG_FB_TFT_UPD161704=m
|
||||||
CONFIG_FB_TFT_WATTEROTT=m
|
CONFIG_FB_TFT_WATTEROTT=m
|
||||||
CONFIG_FB_FLEX=m
|
CONFIG_FB_FLEX=m
|
||||||
CONFIG_FB_TFT_FBTFT_DEVICE=m
|
CONFIG_FB_TFT_FBTFT_DEVICE=m
|
||||||
|
CONFIG_MOST=m
|
||||||
|
CONFIG_MOSTCORE=m
|
||||||
|
CONFIG_AIM_CDEV=m
|
||||||
|
CONFIG_AIM_NETWORK=m
|
||||||
|
CONFIG_AIM_SOUND=m
|
||||||
|
CONFIG_AIM_V4L2=m
|
||||||
|
CONFIG_HDM_DIM2=m
|
||||||
|
CONFIG_HDM_I2C=m
|
||||||
|
CONFIG_HDM_USB=m
|
||||||
CONFIG_X86_PLATFORM_DEVICES=y
|
CONFIG_X86_PLATFORM_DEVICES=y
|
||||||
CONFIG_ACER_WMI=m
|
CONFIG_ACER_WMI=m
|
||||||
CONFIG_ACERHDF=m
|
CONFIG_ACERHDF=m
|
||||||
|
|
@ -7093,6 +7159,7 @@ CONFIG_INTEL_RST=m
|
||||||
CONFIG_INTEL_SMARTCONNECT=m
|
CONFIG_INTEL_SMARTCONNECT=m
|
||||||
CONFIG_PVPANIC=m
|
CONFIG_PVPANIC=m
|
||||||
CONFIG_INTEL_PMC_IPC=m
|
CONFIG_INTEL_PMC_IPC=m
|
||||||
|
CONFIG_SURFACE_PRO3_BUTTON=m
|
||||||
CONFIG_CHROME_PLATFORMS=y
|
CONFIG_CHROME_PLATFORMS=y
|
||||||
CONFIG_CHROMEOS_LAPTOP=m
|
CONFIG_CHROMEOS_LAPTOP=m
|
||||||
CONFIG_CHROMEOS_PSTORE=m
|
CONFIG_CHROMEOS_PSTORE=m
|
||||||
|
|
@ -7212,8 +7279,8 @@ CONFIG_IIO_ST_ACCEL_3AXIS=m
|
||||||
CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
|
CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
|
||||||
CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
|
CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
|
||||||
CONFIG_KXSD9=m
|
CONFIG_KXSD9=m
|
||||||
CONFIG_MMA8452=m
|
|
||||||
CONFIG_KXCJK1013=m
|
CONFIG_KXCJK1013=m
|
||||||
|
CONFIG_MMA8452=m
|
||||||
CONFIG_MMA9551_CORE=m
|
CONFIG_MMA9551_CORE=m
|
||||||
CONFIG_MMA9551=m
|
CONFIG_MMA9551=m
|
||||||
CONFIG_MMA9553=m
|
CONFIG_MMA9553=m
|
||||||
|
|
@ -7356,8 +7423,11 @@ CONFIG_ISL29125=m
|
||||||
CONFIG_HID_SENSOR_ALS=m
|
CONFIG_HID_SENSOR_ALS=m
|
||||||
CONFIG_HID_SENSOR_PROX=m
|
CONFIG_HID_SENSOR_PROX=m
|
||||||
CONFIG_JSA1212=m
|
CONFIG_JSA1212=m
|
||||||
|
CONFIG_RPR0521=m
|
||||||
CONFIG_SENSORS_LM3533=m
|
CONFIG_SENSORS_LM3533=m
|
||||||
CONFIG_LTR501=m
|
CONFIG_LTR501=m
|
||||||
|
CONFIG_OPT3001=m
|
||||||
|
CONFIG_PA12203001=m
|
||||||
CONFIG_STK3310=m
|
CONFIG_STK3310=m
|
||||||
CONFIG_TCS3414=m
|
CONFIG_TCS3414=m
|
||||||
CONFIG_TCS3472=m
|
CONFIG_TCS3472=m
|
||||||
|
|
@ -7444,6 +7514,7 @@ CONFIG_VME_USER=m
|
||||||
CONFIG_VME_PIO2=m
|
CONFIG_VME_PIO2=m
|
||||||
CONFIG_PWM=y
|
CONFIG_PWM=y
|
||||||
CONFIG_PWM_SYSFS=y
|
CONFIG_PWM_SYSFS=y
|
||||||
|
CONFIG_PWM_CRC=y
|
||||||
CONFIG_PWM_LP3943=m
|
CONFIG_PWM_LP3943=m
|
||||||
CONFIG_PWM_LPSS=m
|
CONFIG_PWM_LPSS=m
|
||||||
CONFIG_PWM_LPSS_PCI=m
|
CONFIG_PWM_LPSS_PCI=m
|
||||||
|
|
@ -7476,7 +7547,12 @@ CONFIG_POWERCAP=y
|
||||||
CONFIG_INTEL_RAPL=m
|
CONFIG_INTEL_RAPL=m
|
||||||
CONFIG_MCB=m
|
CONFIG_MCB=m
|
||||||
CONFIG_MCB_PCI=m
|
CONFIG_MCB_PCI=m
|
||||||
|
|
||||||
|
#
|
||||||
|
# Performance monitor support
|
||||||
|
#
|
||||||
CONFIG_RAS=y
|
CONFIG_RAS=y
|
||||||
|
CONFIG_AMD_MCE_INJ=m
|
||||||
CONFIG_THUNDERBOLT=m
|
CONFIG_THUNDERBOLT=m
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -7486,8 +7562,10 @@ CONFIG_THUNDERBOLT=m
|
||||||
CONFIG_LIBNVDIMM=y
|
CONFIG_LIBNVDIMM=y
|
||||||
CONFIG_BLK_DEV_PMEM=m
|
CONFIG_BLK_DEV_PMEM=m
|
||||||
CONFIG_ND_BLK=m
|
CONFIG_ND_BLK=m
|
||||||
|
CONFIG_ND_CLAIM=y
|
||||||
CONFIG_ND_BTT=m
|
CONFIG_ND_BTT=m
|
||||||
CONFIG_BTT=y
|
CONFIG_BTT=y
|
||||||
|
CONFIG_NVMEM=m
|
||||||
|
|
||||||
#
|
#
|
||||||
# Firmware Drivers
|
# Firmware Drivers
|
||||||
|
|
@ -7522,7 +7600,7 @@ CONFIG_DCACHE_WORD_ACCESS=y
|
||||||
# CONFIG_EXT2_FS is not set
|
# CONFIG_EXT2_FS is not set
|
||||||
# CONFIG_EXT3_FS is not set
|
# CONFIG_EXT3_FS is not set
|
||||||
CONFIG_EXT4_FS=y
|
CONFIG_EXT4_FS=y
|
||||||
CONFIG_EXT4_USE_FOR_EXT23=y
|
CONFIG_EXT4_USE_FOR_EXT2=y
|
||||||
CONFIG_EXT4_FS_POSIX_ACL=y
|
CONFIG_EXT4_FS_POSIX_ACL=y
|
||||||
CONFIG_EXT4_FS_SECURITY=y
|
CONFIG_EXT4_FS_SECURITY=y
|
||||||
CONFIG_EXT4_ENCRYPTION=m
|
CONFIG_EXT4_ENCRYPTION=m
|
||||||
|
|
@ -7883,7 +7961,7 @@ CONFIG_DEBUG_KERNEL=y
|
||||||
#
|
#
|
||||||
# Memory Debugging
|
# Memory Debugging
|
||||||
#
|
#
|
||||||
# CONFIG_PAGE_EXTENSION is not set
|
CONFIG_PAGE_EXTENSION=y
|
||||||
# CONFIG_DEBUG_PAGEALLOC is not set
|
# CONFIG_DEBUG_PAGEALLOC is not set
|
||||||
# CONFIG_DEBUG_OBJECTS is not set
|
# CONFIG_DEBUG_OBJECTS is not set
|
||||||
# CONFIG_SLUB_DEBUG_ON is not set
|
# CONFIG_SLUB_DEBUG_ON is not set
|
||||||
|
|
@ -7955,7 +8033,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
|
||||||
CONFIG_TORTURE_TEST=m
|
CONFIG_TORTURE_TEST=m
|
||||||
# CONFIG_RCU_TORTURE_TEST is not set
|
# CONFIG_RCU_TORTURE_TEST is not set
|
||||||
CONFIG_RCU_CPU_STALL_TIMEOUT=60
|
CONFIG_RCU_CPU_STALL_TIMEOUT=60
|
||||||
# CONFIG_RCU_CPU_STALL_INFO is not set
|
|
||||||
# CONFIG_RCU_TRACE is not set
|
# CONFIG_RCU_TRACE is not set
|
||||||
# CONFIG_RCU_EQS_DEBUG is not set
|
# CONFIG_RCU_EQS_DEBUG is not set
|
||||||
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
|
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
|
||||||
|
|
@ -8038,6 +8115,7 @@ CONFIG_TEST_BPF=m
|
||||||
CONFIG_TEST_FIRMWARE=m
|
CONFIG_TEST_FIRMWARE=m
|
||||||
CONFIG_TEST_UDELAY=m
|
CONFIG_TEST_UDELAY=m
|
||||||
CONFIG_MEMTEST=y
|
CONFIG_MEMTEST=y
|
||||||
|
CONFIG_TEST_STATIC_KEYS=m
|
||||||
# CONFIG_SAMPLES is not set
|
# CONFIG_SAMPLES is not set
|
||||||
CONFIG_HAVE_ARCH_KGDB=y
|
CONFIG_HAVE_ARCH_KGDB=y
|
||||||
CONFIG_KGDB=y
|
CONFIG_KGDB=y
|
||||||
|
|
@ -8118,7 +8196,6 @@ CONFIG_SECURITY_APPARMOR=y
|
||||||
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
|
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
|
||||||
CONFIG_SECURITY_APPARMOR_HASH=y
|
CONFIG_SECURITY_APPARMOR_HASH=y
|
||||||
CONFIG_SECURITY_YAMA=y
|
CONFIG_SECURITY_YAMA=y
|
||||||
CONFIG_SECURITY_YAMA_STACKED=y
|
|
||||||
CONFIG_INTEGRITY=y
|
CONFIG_INTEGRITY=y
|
||||||
CONFIG_INTEGRITY_SIGNATURE=y
|
CONFIG_INTEGRITY_SIGNATURE=y
|
||||||
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
|
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
|
||||||
|
|
@ -8145,7 +8222,6 @@ CONFIG_EVM_EXTRA_SMACK_XATTRS=y
|
||||||
# CONFIG_DEFAULT_SECURITY_SMACK is not set
|
# CONFIG_DEFAULT_SECURITY_SMACK is not set
|
||||||
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
|
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
|
||||||
CONFIG_DEFAULT_SECURITY_APPARMOR=y
|
CONFIG_DEFAULT_SECURITY_APPARMOR=y
|
||||||
# CONFIG_DEFAULT_SECURITY_YAMA is not set
|
|
||||||
# CONFIG_DEFAULT_SECURITY_DAC is not set
|
# CONFIG_DEFAULT_SECURITY_DAC is not set
|
||||||
CONFIG_DEFAULT_SECURITY="apparmor"
|
CONFIG_DEFAULT_SECURITY="apparmor"
|
||||||
CONFIG_XOR_BLOCKS=m
|
CONFIG_XOR_BLOCKS=m
|
||||||
|
|
@ -8181,6 +8257,7 @@ CONFIG_CRYPTO_USER=m
|
||||||
CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
|
CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
|
||||||
CONFIG_CRYPTO_GF128MUL=m
|
CONFIG_CRYPTO_GF128MUL=m
|
||||||
CONFIG_CRYPTO_NULL=m
|
CONFIG_CRYPTO_NULL=m
|
||||||
|
CONFIG_CRYPTO_NULL2=y
|
||||||
CONFIG_CRYPTO_PCRYPT=m
|
CONFIG_CRYPTO_PCRYPT=m
|
||||||
CONFIG_CRYPTO_WORKQUEUE=y
|
CONFIG_CRYPTO_WORKQUEUE=y
|
||||||
CONFIG_CRYPTO_CRYPTD=m
|
CONFIG_CRYPTO_CRYPTD=m
|
||||||
|
|
@ -8305,12 +8382,20 @@ CONFIG_CRYPTO_DEV_CCP_DD=m
|
||||||
CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
|
CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
|
||||||
CONFIG_CRYPTO_DEV_QAT=m
|
CONFIG_CRYPTO_DEV_QAT=m
|
||||||
CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
|
CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
|
||||||
|
CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
|
||||||
CONFIG_ASYMMETRIC_KEY_TYPE=y
|
CONFIG_ASYMMETRIC_KEY_TYPE=y
|
||||||
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
|
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
|
||||||
CONFIG_PUBLIC_KEY_ALGO_RSA=y
|
CONFIG_PUBLIC_KEY_ALGO_RSA=y
|
||||||
CONFIG_X509_CERTIFICATE_PARSER=y
|
CONFIG_X509_CERTIFICATE_PARSER=y
|
||||||
CONFIG_PKCS7_MESSAGE_PARSER=m
|
CONFIG_PKCS7_MESSAGE_PARSER=y
|
||||||
CONFIG_PKCS7_TEST_KEY=m
|
CONFIG_PKCS7_TEST_KEY=m
|
||||||
|
CONFIG_SIGNED_PE_FILE_VERIFICATION=y
|
||||||
|
|
||||||
|
#
|
||||||
|
# Certificates for signature checking
|
||||||
|
#
|
||||||
|
CONFIG_SYSTEM_TRUSTED_KEYRING=y
|
||||||
|
CONFIG_SYSTEM_TRUSTED_KEYS=""
|
||||||
CONFIG_HAVE_KVM=y
|
CONFIG_HAVE_KVM=y
|
||||||
CONFIG_HAVE_KVM_IRQCHIP=y
|
CONFIG_HAVE_KVM_IRQCHIP=y
|
||||||
CONFIG_HAVE_KVM_IRQFD=y
|
CONFIG_HAVE_KVM_IRQFD=y
|
||||||
|
|
@ -8346,7 +8431,6 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y
|
||||||
CONFIG_GENERIC_PCI_IOMAP=y
|
CONFIG_GENERIC_PCI_IOMAP=y
|
||||||
CONFIG_GENERIC_IOMAP=y
|
CONFIG_GENERIC_IOMAP=y
|
||||||
CONFIG_GENERIC_IO=y
|
CONFIG_GENERIC_IO=y
|
||||||
CONFIG_PERCPU_RWSEM=y
|
|
||||||
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
|
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
|
||||||
CONFIG_CRC_CCITT=m
|
CONFIG_CRC_CCITT=m
|
||||||
CONFIG_CRC16=y
|
CONFIG_CRC16=y
|
||||||
|
|
@ -8399,6 +8483,7 @@ CONFIG_TEXTSEARCH=y
|
||||||
CONFIG_TEXTSEARCH_KMP=m
|
CONFIG_TEXTSEARCH_KMP=m
|
||||||
CONFIG_TEXTSEARCH_BM=m
|
CONFIG_TEXTSEARCH_BM=m
|
||||||
CONFIG_TEXTSEARCH_FSM=m
|
CONFIG_TEXTSEARCH_FSM=m
|
||||||
|
CONFIG_BTREE=y
|
||||||
CONFIG_INTERVAL_TREE=y
|
CONFIG_INTERVAL_TREE=y
|
||||||
CONFIG_ASSOCIATIVE_ARRAY=y
|
CONFIG_ASSOCIATIVE_ARRAY=y
|
||||||
CONFIG_HAS_IOMEM=y
|
CONFIG_HAS_IOMEM=y
|
||||||
|
|
@ -8412,7 +8497,6 @@ CONFIG_GLOB=y
|
||||||
CONFIG_NLATTR=y
|
CONFIG_NLATTR=y
|
||||||
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
|
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
|
||||||
CONFIG_LRU_CACHE=m
|
CONFIG_LRU_CACHE=m
|
||||||
CONFIG_AVERAGE=y
|
|
||||||
CONFIG_CLZ_TAB=y
|
CONFIG_CLZ_TAB=y
|
||||||
CONFIG_CORDIC=m
|
CONFIG_CORDIC=m
|
||||||
CONFIG_DDR=y
|
CONFIG_DDR=y
|
||||||
|
|
@ -8424,5 +8508,6 @@ CONFIG_FONT_SUPPORT=y
|
||||||
# CONFIG_FONTS is not set
|
# CONFIG_FONTS is not set
|
||||||
CONFIG_FONT_8x8=y
|
CONFIG_FONT_8x8=y
|
||||||
CONFIG_FONT_8x16=y
|
CONFIG_FONT_8x16=y
|
||||||
|
# CONFIG_SG_SPLIT is not set
|
||||||
CONFIG_ARCH_HAS_SG_CHAIN=y
|
CONFIG_ARCH_HAS_SG_CHAIN=y
|
||||||
CONFIG_ARCH_HAS_PMEM_API=y
|
CONFIG_ARCH_HAS_MMIO_FLUSH=y
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/x86 4.2.0-gnu Kernel Configuration
|
# Linux/x86 4.3.0-gnu Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_64BIT=y
|
CONFIG_64BIT=y
|
||||||
CONFIG_X86_64=y
|
CONFIG_X86_64=y
|
||||||
|
|
@ -136,10 +136,6 @@ CONFIG_SRCU=y
|
||||||
# CONFIG_TASKS_RCU is not set
|
# CONFIG_TASKS_RCU is not set
|
||||||
CONFIG_RCU_STALL_COMMON=y
|
CONFIG_RCU_STALL_COMMON=y
|
||||||
# CONFIG_TREE_RCU_TRACE is not set
|
# CONFIG_TREE_RCU_TRACE is not set
|
||||||
CONFIG_RCU_NOCB_CPU=y
|
|
||||||
# CONFIG_RCU_NOCB_CPU_NONE is not set
|
|
||||||
# CONFIG_RCU_NOCB_CPU_ZERO is not set
|
|
||||||
CONFIG_RCU_NOCB_CPU_ALL=y
|
|
||||||
# CONFIG_RCU_EXPEDITE_BOOT is not set
|
# CONFIG_RCU_EXPEDITE_BOOT is not set
|
||||||
CONFIG_BUILD_BIN2C=y
|
CONFIG_BUILD_BIN2C=y
|
||||||
# CONFIG_IKCONFIG is not set
|
# CONFIG_IKCONFIG is not set
|
||||||
|
|
@ -147,12 +143,14 @@ CONFIG_LOG_BUF_SHIFT=18
|
||||||
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
|
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
|
||||||
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
|
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
|
||||||
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
|
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
|
||||||
|
CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
|
||||||
CONFIG_ARCH_SUPPORTS_INT128=y
|
CONFIG_ARCH_SUPPORTS_INT128=y
|
||||||
CONFIG_NUMA_BALANCING=y
|
CONFIG_NUMA_BALANCING=y
|
||||||
CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
|
CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
|
||||||
CONFIG_CGROUPS=y
|
CONFIG_CGROUPS=y
|
||||||
# CONFIG_CGROUP_DEBUG is not set
|
# CONFIG_CGROUP_DEBUG is not set
|
||||||
CONFIG_CGROUP_FREEZER=y
|
CONFIG_CGROUP_FREEZER=y
|
||||||
|
CONFIG_CGROUP_PIDS=y
|
||||||
CONFIG_CGROUP_DEVICE=y
|
CONFIG_CGROUP_DEVICE=y
|
||||||
CONFIG_CPUSETS=y
|
CONFIG_CPUSETS=y
|
||||||
CONFIG_PROC_PID_CPUSET=y
|
CONFIG_PROC_PID_CPUSET=y
|
||||||
|
|
@ -218,7 +216,9 @@ CONFIG_BPF_SYSCALL=y
|
||||||
CONFIG_SHMEM=y
|
CONFIG_SHMEM=y
|
||||||
CONFIG_AIO=y
|
CONFIG_AIO=y
|
||||||
CONFIG_ADVISE_SYSCALLS=y
|
CONFIG_ADVISE_SYSCALLS=y
|
||||||
|
CONFIG_USERFAULTFD=y
|
||||||
CONFIG_PCI_QUIRKS=y
|
CONFIG_PCI_QUIRKS=y
|
||||||
|
CONFIG_MEMBARRIER=y
|
||||||
# CONFIG_EMBEDDED is not set
|
# CONFIG_EMBEDDED is not set
|
||||||
CONFIG_HAVE_PERF_EVENTS=y
|
CONFIG_HAVE_PERF_EVENTS=y
|
||||||
|
|
||||||
|
|
@ -234,15 +234,17 @@ CONFIG_SLUB_DEBUG=y
|
||||||
CONFIG_SLUB=y
|
CONFIG_SLUB=y
|
||||||
# CONFIG_SLOB is not set
|
# CONFIG_SLOB is not set
|
||||||
CONFIG_SLUB_CPU_PARTIAL=y
|
CONFIG_SLUB_CPU_PARTIAL=y
|
||||||
CONFIG_SYSTEM_TRUSTED_KEYRING=y
|
# CONFIG_SYSTEM_DATA_VERIFICATION is not set
|
||||||
CONFIG_PROFILING=y
|
CONFIG_PROFILING=y
|
||||||
CONFIG_TRACEPOINTS=y
|
CONFIG_TRACEPOINTS=y
|
||||||
|
CONFIG_KEXEC_CORE=y
|
||||||
CONFIG_OPROFILE=m
|
CONFIG_OPROFILE=m
|
||||||
# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
|
# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
|
||||||
CONFIG_HAVE_OPROFILE=y
|
CONFIG_HAVE_OPROFILE=y
|
||||||
CONFIG_OPROFILE_NMI_TIMER=y
|
CONFIG_OPROFILE_NMI_TIMER=y
|
||||||
CONFIG_KPROBES=y
|
CONFIG_KPROBES=y
|
||||||
CONFIG_JUMP_LABEL=y
|
CONFIG_JUMP_LABEL=y
|
||||||
|
# CONFIG_STATIC_KEYS_SELFTEST is not set
|
||||||
CONFIG_OPTPROBES=y
|
CONFIG_OPTPROBES=y
|
||||||
CONFIG_KPROBES_ON_FTRACE=y
|
CONFIG_KPROBES_ON_FTRACE=y
|
||||||
CONFIG_UPROBES=y
|
CONFIG_UPROBES=y
|
||||||
|
|
@ -313,6 +315,11 @@ CONFIG_MODULE_UNLOAD=y
|
||||||
CONFIG_MODVERSIONS=y
|
CONFIG_MODVERSIONS=y
|
||||||
CONFIG_MODULE_SRCVERSION_ALL=y
|
CONFIG_MODULE_SRCVERSION_ALL=y
|
||||||
# CONFIG_MODULE_SIG is not set
|
# CONFIG_MODULE_SIG is not set
|
||||||
|
# CONFIG_MODULE_SIG_SHA1 is not set
|
||||||
|
# CONFIG_MODULE_SIG_SHA224 is not set
|
||||||
|
# CONFIG_MODULE_SIG_SHA256 is not set
|
||||||
|
# CONFIG_MODULE_SIG_SHA384 is not set
|
||||||
|
# CONFIG_MODULE_SIG_SHA512 is not set
|
||||||
# CONFIG_MODULE_COMPRESS is not set
|
# CONFIG_MODULE_COMPRESS is not set
|
||||||
CONFIG_MODULES_TREE_LOOKUP=y
|
CONFIG_MODULES_TREE_LOOKUP=y
|
||||||
CONFIG_STOP_MACHINE=y
|
CONFIG_STOP_MACHINE=y
|
||||||
|
|
@ -404,7 +411,7 @@ CONFIG_PARAVIRT_SPINLOCKS=y
|
||||||
CONFIG_XEN=y
|
CONFIG_XEN=y
|
||||||
CONFIG_XEN_DOM0=y
|
CONFIG_XEN_DOM0=y
|
||||||
CONFIG_XEN_PVHVM=y
|
CONFIG_XEN_PVHVM=y
|
||||||
CONFIG_XEN_MAX_DOMAIN_MEMORY=500
|
CONFIG_XEN_512GB=y
|
||||||
CONFIG_XEN_SAVE_RESTORE=y
|
CONFIG_XEN_SAVE_RESTORE=y
|
||||||
# CONFIG_XEN_DEBUG_FS is not set
|
# CONFIG_XEN_DEBUG_FS is not set
|
||||||
CONFIG_XEN_PVH=y
|
CONFIG_XEN_PVH=y
|
||||||
|
|
@ -453,6 +460,7 @@ CONFIG_X86_MCE_AMD=y
|
||||||
CONFIG_X86_MCE_THRESHOLD=y
|
CONFIG_X86_MCE_THRESHOLD=y
|
||||||
CONFIG_X86_MCE_INJECT=m
|
CONFIG_X86_MCE_INJECT=m
|
||||||
CONFIG_X86_THERMAL_VECTOR=y
|
CONFIG_X86_THERMAL_VECTOR=y
|
||||||
|
# CONFIG_VM86 is not set
|
||||||
CONFIG_X86_16BIT=y
|
CONFIG_X86_16BIT=y
|
||||||
CONFIG_X86_ESPFIX64=y
|
CONFIG_X86_ESPFIX64=y
|
||||||
CONFIG_X86_VSYSCALL_EMULATION=y
|
CONFIG_X86_VSYSCALL_EMULATION=y
|
||||||
|
|
@ -536,6 +544,9 @@ CONFIG_PGTABLE_MAPPING=y
|
||||||
CONFIG_GENERIC_EARLY_IOREMAP=y
|
CONFIG_GENERIC_EARLY_IOREMAP=y
|
||||||
CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
|
CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
|
||||||
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
|
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
|
||||||
|
CONFIG_IDLE_PAGE_TRACKING=y
|
||||||
|
CONFIG_FRAME_VECTOR=y
|
||||||
|
CONFIG_X86_PMEM_LEGACY_DEVICE=y
|
||||||
CONFIG_X86_PMEM_LEGACY=y
|
CONFIG_X86_PMEM_LEGACY=y
|
||||||
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
|
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
|
||||||
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
|
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
|
||||||
|
|
@ -548,7 +559,7 @@ CONFIG_X86_PAT=y
|
||||||
CONFIG_ARCH_USES_PG_UNCACHED=y
|
CONFIG_ARCH_USES_PG_UNCACHED=y
|
||||||
CONFIG_ARCH_RANDOM=y
|
CONFIG_ARCH_RANDOM=y
|
||||||
CONFIG_X86_SMAP=y
|
CONFIG_X86_SMAP=y
|
||||||
# CONFIG_X86_INTEL_MPX is not set
|
CONFIG_X86_INTEL_MPX=y
|
||||||
CONFIG_EFI=y
|
CONFIG_EFI=y
|
||||||
CONFIG_EFI_STUB=y
|
CONFIG_EFI_STUB=y
|
||||||
CONFIG_EFI_MIXED=y
|
CONFIG_EFI_MIXED=y
|
||||||
|
|
@ -562,6 +573,7 @@ CONFIG_SCHED_HRTICK=y
|
||||||
CONFIG_KEXEC=y
|
CONFIG_KEXEC=y
|
||||||
CONFIG_KEXEC_FILE=y
|
CONFIG_KEXEC_FILE=y
|
||||||
CONFIG_KEXEC_VERIFY_SIG=y
|
CONFIG_KEXEC_VERIFY_SIG=y
|
||||||
|
CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
|
||||||
CONFIG_CRASH_DUMP=y
|
CONFIG_CRASH_DUMP=y
|
||||||
CONFIG_KEXEC_JUMP=y
|
CONFIG_KEXEC_JUMP=y
|
||||||
CONFIG_PHYSICAL_START=0x1000000
|
CONFIG_PHYSICAL_START=0x1000000
|
||||||
|
|
@ -575,6 +587,7 @@ CONFIG_HOTPLUG_CPU=y
|
||||||
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
|
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
|
||||||
# CONFIG_COMPAT_VDSO is not set
|
# CONFIG_COMPAT_VDSO is not set
|
||||||
# CONFIG_CMDLINE_BOOL is not set
|
# CONFIG_CMDLINE_BOOL is not set
|
||||||
|
CONFIG_MODIFY_LDT_SYSCALL=y
|
||||||
CONFIG_HAVE_LIVEPATCH=y
|
CONFIG_HAVE_LIVEPATCH=y
|
||||||
CONFIG_LIVEPATCH=y
|
CONFIG_LIVEPATCH=y
|
||||||
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
|
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
|
||||||
|
|
@ -587,6 +600,7 @@ CONFIG_USE_PERCPU_NUMA_NODE_ID=y
|
||||||
CONFIG_ARCH_HIBERNATION_HEADER=y
|
CONFIG_ARCH_HIBERNATION_HEADER=y
|
||||||
CONFIG_SUSPEND=y
|
CONFIG_SUSPEND=y
|
||||||
CONFIG_SUSPEND_FREEZER=y
|
CONFIG_SUSPEND_FREEZER=y
|
||||||
|
# CONFIG_SUSPEND_SKIP_SYNC is not set
|
||||||
CONFIG_HIBERNATE_CALLBACKS=y
|
CONFIG_HIBERNATE_CALLBACKS=y
|
||||||
CONFIG_HIBERNATION=y
|
CONFIG_HIBERNATION=y
|
||||||
CONFIG_PM_STD_PARTITION=""
|
CONFIG_PM_STD_PARTITION=""
|
||||||
|
|
@ -620,6 +634,8 @@ CONFIG_ACPI_BUTTON=y
|
||||||
CONFIG_ACPI_VIDEO=m
|
CONFIG_ACPI_VIDEO=m
|
||||||
CONFIG_ACPI_FAN=y
|
CONFIG_ACPI_FAN=y
|
||||||
CONFIG_ACPI_DOCK=y
|
CONFIG_ACPI_DOCK=y
|
||||||
|
CONFIG_ACPI_CPU_FREQ_PSS=y
|
||||||
|
CONFIG_ACPI_PROCESSOR_IDLE=y
|
||||||
CONFIG_ACPI_PROCESSOR=y
|
CONFIG_ACPI_PROCESSOR=y
|
||||||
CONFIG_ACPI_IPMI=m
|
CONFIG_ACPI_IPMI=m
|
||||||
CONFIG_ACPI_HOTPLUG_CPU=y
|
CONFIG_ACPI_HOTPLUG_CPU=y
|
||||||
|
|
@ -849,7 +865,6 @@ CONFIG_NET_IPVTI=m
|
||||||
CONFIG_NET_UDP_TUNNEL=m
|
CONFIG_NET_UDP_TUNNEL=m
|
||||||
CONFIG_NET_FOU=m
|
CONFIG_NET_FOU=m
|
||||||
CONFIG_NET_FOU_IP_TUNNELS=y
|
CONFIG_NET_FOU_IP_TUNNELS=y
|
||||||
CONFIG_GENEVE_CORE=m
|
|
||||||
CONFIG_INET_AH=m
|
CONFIG_INET_AH=m
|
||||||
CONFIG_INET_ESP=m
|
CONFIG_INET_ESP=m
|
||||||
CONFIG_INET_IPCOMP=m
|
CONFIG_INET_IPCOMP=m
|
||||||
|
|
@ -889,6 +904,7 @@ CONFIG_INET6_AH=m
|
||||||
CONFIG_INET6_ESP=m
|
CONFIG_INET6_ESP=m
|
||||||
CONFIG_INET6_IPCOMP=m
|
CONFIG_INET6_IPCOMP=m
|
||||||
CONFIG_IPV6_MIP6=m
|
CONFIG_IPV6_MIP6=m
|
||||||
|
CONFIG_IPV6_ILA=m
|
||||||
CONFIG_INET6_XFRM_TUNNEL=m
|
CONFIG_INET6_XFRM_TUNNEL=m
|
||||||
CONFIG_INET6_TUNNEL=m
|
CONFIG_INET6_TUNNEL=m
|
||||||
CONFIG_INET6_XFRM_MODE_TRANSPORT=m
|
CONFIG_INET6_XFRM_MODE_TRANSPORT=m
|
||||||
|
|
@ -1110,6 +1126,7 @@ CONFIG_IP_VS_WRR=m
|
||||||
CONFIG_IP_VS_LC=m
|
CONFIG_IP_VS_LC=m
|
||||||
CONFIG_IP_VS_WLC=m
|
CONFIG_IP_VS_WLC=m
|
||||||
CONFIG_IP_VS_FO=m
|
CONFIG_IP_VS_FO=m
|
||||||
|
CONFIG_IP_VS_OVF=m
|
||||||
CONFIG_IP_VS_LBLC=m
|
CONFIG_IP_VS_LBLC=m
|
||||||
CONFIG_IP_VS_LBLCR=m
|
CONFIG_IP_VS_LBLCR=m
|
||||||
CONFIG_IP_VS_DH=m
|
CONFIG_IP_VS_DH=m
|
||||||
|
|
@ -1137,7 +1154,9 @@ CONFIG_NF_CONNTRACK_IPV4=m
|
||||||
CONFIG_NF_TABLES_IPV4=m
|
CONFIG_NF_TABLES_IPV4=m
|
||||||
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
|
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
|
||||||
CONFIG_NFT_REJECT_IPV4=m
|
CONFIG_NFT_REJECT_IPV4=m
|
||||||
|
CONFIG_NFT_DUP_IPV4=m
|
||||||
CONFIG_NF_TABLES_ARP=m
|
CONFIG_NF_TABLES_ARP=m
|
||||||
|
CONFIG_NF_DUP_IPV4=m
|
||||||
CONFIG_NF_LOG_ARP=m
|
CONFIG_NF_LOG_ARP=m
|
||||||
CONFIG_NF_LOG_IPV4=m
|
CONFIG_NF_LOG_IPV4=m
|
||||||
CONFIG_NF_REJECT_IPV4=m
|
CONFIG_NF_REJECT_IPV4=m
|
||||||
|
|
@ -1180,6 +1199,8 @@ CONFIG_NF_CONNTRACK_IPV6=m
|
||||||
CONFIG_NF_TABLES_IPV6=m
|
CONFIG_NF_TABLES_IPV6=m
|
||||||
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
|
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
|
||||||
CONFIG_NFT_REJECT_IPV6=m
|
CONFIG_NFT_REJECT_IPV6=m
|
||||||
|
CONFIG_NFT_DUP_IPV6=m
|
||||||
|
CONFIG_NF_DUP_IPV6=m
|
||||||
CONFIG_NF_REJECT_IPV6=m
|
CONFIG_NF_REJECT_IPV6=m
|
||||||
CONFIG_NF_LOG_IPV6=m
|
CONFIG_NF_LOG_IPV6=m
|
||||||
CONFIG_NF_NAT_IPV6=m
|
CONFIG_NF_NAT_IPV6=m
|
||||||
|
|
@ -1406,6 +1427,7 @@ CONFIG_NETLINK_DIAG=m
|
||||||
CONFIG_MPLS=y
|
CONFIG_MPLS=y
|
||||||
CONFIG_NET_MPLS_GSO=m
|
CONFIG_NET_MPLS_GSO=m
|
||||||
CONFIG_MPLS_ROUTING=m
|
CONFIG_MPLS_ROUTING=m
|
||||||
|
CONFIG_MPLS_IPTUNNEL=m
|
||||||
CONFIG_HSR=m
|
CONFIG_HSR=m
|
||||||
# CONFIG_NET_SWITCHDEV is not set
|
# CONFIG_NET_SWITCHDEV is not set
|
||||||
CONFIG_RPS=y
|
CONFIG_RPS=y
|
||||||
|
|
@ -1558,6 +1580,7 @@ CONFIG_BT_BNEP_MC_FILTER=y
|
||||||
CONFIG_BT_BNEP_PROTO_FILTER=y
|
CONFIG_BT_BNEP_PROTO_FILTER=y
|
||||||
CONFIG_BT_CMTP=m
|
CONFIG_BT_CMTP=m
|
||||||
CONFIG_BT_HIDP=m
|
CONFIG_BT_HIDP=m
|
||||||
|
CONFIG_BT_HS=y
|
||||||
CONFIG_BT_LE=y
|
CONFIG_BT_LE=y
|
||||||
CONFIG_BT_6LOWPAN=m
|
CONFIG_BT_6LOWPAN=m
|
||||||
# CONFIG_BT_SELFTEST is not set
|
# CONFIG_BT_SELFTEST is not set
|
||||||
|
|
@ -1569,6 +1592,7 @@ CONFIG_BT_DEBUGFS=y
|
||||||
CONFIG_BT_INTEL=m
|
CONFIG_BT_INTEL=m
|
||||||
CONFIG_BT_BCM=m
|
CONFIG_BT_BCM=m
|
||||||
CONFIG_BT_RTL=m
|
CONFIG_BT_RTL=m
|
||||||
|
CONFIG_BT_QCA=m
|
||||||
CONFIG_BT_HCIBTUSB=m
|
CONFIG_BT_HCIBTUSB=m
|
||||||
CONFIG_BT_HCIBTUSB_BCM=y
|
CONFIG_BT_HCIBTUSB_BCM=y
|
||||||
CONFIG_BT_HCIBTUSB_RTL=y
|
CONFIG_BT_HCIBTUSB_RTL=y
|
||||||
|
|
@ -1581,6 +1605,7 @@ CONFIG_BT_HCIUART_LL=y
|
||||||
CONFIG_BT_HCIUART_3WIRE=y
|
CONFIG_BT_HCIUART_3WIRE=y
|
||||||
CONFIG_BT_HCIUART_INTEL=y
|
CONFIG_BT_HCIUART_INTEL=y
|
||||||
CONFIG_BT_HCIUART_BCM=y
|
CONFIG_BT_HCIUART_BCM=y
|
||||||
|
CONFIG_BT_HCIUART_QCA=y
|
||||||
CONFIG_BT_HCIBCM203X=m
|
CONFIG_BT_HCIBCM203X=m
|
||||||
CONFIG_BT_HCIBPA10X=m
|
CONFIG_BT_HCIBPA10X=m
|
||||||
CONFIG_BT_HCIBFUSB=m
|
CONFIG_BT_HCIBFUSB=m
|
||||||
|
|
@ -1679,8 +1704,12 @@ CONFIG_NFC_ST21NFCA=m
|
||||||
CONFIG_NFC_ST21NFCA_I2C=m
|
CONFIG_NFC_ST21NFCA_I2C=m
|
||||||
CONFIG_NFC_ST_NCI=m
|
CONFIG_NFC_ST_NCI=m
|
||||||
CONFIG_NFC_ST_NCI_I2C=m
|
CONFIG_NFC_ST_NCI_I2C=m
|
||||||
|
CONFIG_NFC_ST_NCI_SPI=m
|
||||||
CONFIG_NFC_NXP_NCI=m
|
CONFIG_NFC_NXP_NCI=m
|
||||||
CONFIG_NFC_NXP_NCI_I2C=m
|
CONFIG_NFC_NXP_NCI_I2C=m
|
||||||
|
CONFIG_NFC_S3FWRN5=m
|
||||||
|
CONFIG_NFC_S3FWRN5_I2C=m
|
||||||
|
CONFIG_LWTUNNEL=y
|
||||||
CONFIG_HAVE_BPF_JIT=y
|
CONFIG_HAVE_BPF_JIT=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -2040,6 +2069,7 @@ CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
|
||||||
CONFIG_ECHO=m
|
CONFIG_ECHO=m
|
||||||
# CONFIG_CXL_BASE is not set
|
# CONFIG_CXL_BASE is not set
|
||||||
# CONFIG_CXL_KERNEL_API is not set
|
# CONFIG_CXL_KERNEL_API is not set
|
||||||
|
# CONFIG_CXL_EEH is not set
|
||||||
CONFIG_HAVE_IDE=y
|
CONFIG_HAVE_IDE=y
|
||||||
# CONFIG_IDE is not set
|
# CONFIG_IDE is not set
|
||||||
|
|
||||||
|
|
@ -2168,6 +2198,7 @@ CONFIG_SCSI_IPR_TRACE=y
|
||||||
CONFIG_SCSI_IPR_DUMP=y
|
CONFIG_SCSI_IPR_DUMP=y
|
||||||
CONFIG_SCSI_QLOGIC_1280=m
|
CONFIG_SCSI_QLOGIC_1280=m
|
||||||
CONFIG_SCSI_QLA_FC=m
|
CONFIG_SCSI_QLA_FC=m
|
||||||
|
CONFIG_TCM_QLA2XXX=m
|
||||||
CONFIG_SCSI_QLA_ISCSI=m
|
CONFIG_SCSI_QLA_ISCSI=m
|
||||||
CONFIG_SCSI_LPFC=m
|
CONFIG_SCSI_LPFC=m
|
||||||
# CONFIG_SCSI_LPFC_DEBUG_FS is not set
|
# CONFIG_SCSI_LPFC_DEBUG_FS is not set
|
||||||
|
|
@ -2185,7 +2216,7 @@ CONFIG_PCMCIA_AHA152X=m
|
||||||
CONFIG_PCMCIA_FDOMAIN=m
|
CONFIG_PCMCIA_FDOMAIN=m
|
||||||
CONFIG_PCMCIA_QLOGIC=m
|
CONFIG_PCMCIA_QLOGIC=m
|
||||||
CONFIG_PCMCIA_SYM53C500=m
|
CONFIG_PCMCIA_SYM53C500=m
|
||||||
CONFIG_SCSI_DH=m
|
CONFIG_SCSI_DH=y
|
||||||
CONFIG_SCSI_DH_RDAC=m
|
CONFIG_SCSI_DH_RDAC=m
|
||||||
CONFIG_SCSI_DH_HP_SW=m
|
CONFIG_SCSI_DH_HP_SW=m
|
||||||
CONFIG_SCSI_DH_EMC=m
|
CONFIG_SCSI_DH_EMC=m
|
||||||
|
|
@ -2391,6 +2422,7 @@ CONFIG_TUN=y
|
||||||
CONFIG_VETH=m
|
CONFIG_VETH=m
|
||||||
CONFIG_VIRTIO_NET=y
|
CONFIG_VIRTIO_NET=y
|
||||||
CONFIG_NLMON=m
|
CONFIG_NLMON=m
|
||||||
|
CONFIG_NET_VRF=m
|
||||||
CONFIG_SUNGEM_PHY=m
|
CONFIG_SUNGEM_PHY=m
|
||||||
CONFIG_ARCNET=m
|
CONFIG_ARCNET=m
|
||||||
CONFIG_ARCNET_1201=m
|
CONFIG_ARCNET_1201=m
|
||||||
|
|
@ -2492,9 +2524,10 @@ CONFIG_CNIC=m
|
||||||
CONFIG_TIGON3=m
|
CONFIG_TIGON3=m
|
||||||
CONFIG_BNX2X=m
|
CONFIG_BNX2X=m
|
||||||
CONFIG_BNX2X_SRIOV=y
|
CONFIG_BNX2X_SRIOV=y
|
||||||
|
CONFIG_BNX2X_VXLAN=y
|
||||||
CONFIG_NET_VENDOR_BROCADE=y
|
CONFIG_NET_VENDOR_BROCADE=y
|
||||||
CONFIG_BNA=m
|
CONFIG_BNA=m
|
||||||
CONFIG_NET_VENDOR_CAVIUM=m
|
CONFIG_NET_VENDOR_CAVIUM=y
|
||||||
CONFIG_THUNDER_NIC_PF=m
|
CONFIG_THUNDER_NIC_PF=m
|
||||||
CONFIG_THUNDER_NIC_VF=m
|
CONFIG_THUNDER_NIC_VF=m
|
||||||
CONFIG_THUNDER_NIC_BGX=m
|
CONFIG_THUNDER_NIC_BGX=m
|
||||||
|
|
@ -2581,6 +2614,8 @@ CONFIG_MLX4_CORE=m
|
||||||
CONFIG_MLX4_DEBUG=y
|
CONFIG_MLX4_DEBUG=y
|
||||||
CONFIG_MLX5_CORE=m
|
CONFIG_MLX5_CORE=m
|
||||||
CONFIG_MLX5_CORE_EN=y
|
CONFIG_MLX5_CORE_EN=y
|
||||||
|
CONFIG_MLXSW_CORE=m
|
||||||
|
CONFIG_MLXSW_PCI=m
|
||||||
CONFIG_NET_VENDOR_MICREL=y
|
CONFIG_NET_VENDOR_MICREL=y
|
||||||
CONFIG_KS8842=m
|
CONFIG_KS8842=m
|
||||||
CONFIG_KS8851=m
|
CONFIG_KS8851=m
|
||||||
|
|
@ -2659,6 +2694,7 @@ CONFIG_HAPPYMEAL=m
|
||||||
CONFIG_SUNGEM=m
|
CONFIG_SUNGEM=m
|
||||||
CONFIG_CASSINI=m
|
CONFIG_CASSINI=m
|
||||||
CONFIG_NIU=m
|
CONFIG_NIU=m
|
||||||
|
CONFIG_NET_VENDOR_SYNOPSYS=y
|
||||||
CONFIG_NET_VENDOR_TEHUTI=y
|
CONFIG_NET_VENDOR_TEHUTI=y
|
||||||
CONFIG_TEHUTI=m
|
CONFIG_TEHUTI=m
|
||||||
CONFIG_NET_VENDOR_TI=y
|
CONFIG_NET_VENDOR_TI=y
|
||||||
|
|
@ -2687,6 +2723,7 @@ CONFIG_PHYLIB=y
|
||||||
#
|
#
|
||||||
# MII PHY device drivers
|
# MII PHY device drivers
|
||||||
#
|
#
|
||||||
|
CONFIG_AQUANTIA_PHY=m
|
||||||
CONFIG_AT803X_PHY=m
|
CONFIG_AT803X_PHY=m
|
||||||
CONFIG_AMD_PHY=m
|
CONFIG_AMD_PHY=m
|
||||||
CONFIG_MARVELL_PHY=m
|
CONFIG_MARVELL_PHY=m
|
||||||
|
|
@ -2695,6 +2732,7 @@ CONFIG_QSEMI_PHY=m
|
||||||
CONFIG_LXT_PHY=m
|
CONFIG_LXT_PHY=m
|
||||||
CONFIG_CICADA_PHY=m
|
CONFIG_CICADA_PHY=m
|
||||||
CONFIG_VITESSE_PHY=m
|
CONFIG_VITESSE_PHY=m
|
||||||
|
CONFIG_TERANETICS_PHY=m
|
||||||
CONFIG_SMSC_PHY=m
|
CONFIG_SMSC_PHY=m
|
||||||
CONFIG_BROADCOM_PHY=m
|
CONFIG_BROADCOM_PHY=m
|
||||||
CONFIG_BCM7XXX_PHY=m
|
CONFIG_BCM7XXX_PHY=m
|
||||||
|
|
@ -2705,10 +2743,13 @@ CONFIG_NATIONAL_PHY=m
|
||||||
CONFIG_STE10XP=m
|
CONFIG_STE10XP=m
|
||||||
CONFIG_LSI_ET1011C_PHY=m
|
CONFIG_LSI_ET1011C_PHY=m
|
||||||
CONFIG_MICREL_PHY=m
|
CONFIG_MICREL_PHY=m
|
||||||
|
# CONFIG_DP83848_PHY is not set
|
||||||
CONFIG_DP83867_PHY=m
|
CONFIG_DP83867_PHY=m
|
||||||
|
CONFIG_MICROCHIP_PHY=m
|
||||||
CONFIG_FIXED_PHY=y
|
CONFIG_FIXED_PHY=y
|
||||||
CONFIG_MDIO_BITBANG=m
|
CONFIG_MDIO_BITBANG=m
|
||||||
CONFIG_MDIO_GPIO=m
|
CONFIG_MDIO_GPIO=m
|
||||||
|
CONFIG_MDIO_OCTEON=m
|
||||||
CONFIG_MDIO_BCM_UNIMAC=m
|
CONFIG_MDIO_BCM_UNIMAC=m
|
||||||
CONFIG_MICREL_KS8995MA=m
|
CONFIG_MICREL_KS8995MA=m
|
||||||
CONFIG_PLIP=m
|
CONFIG_PLIP=m
|
||||||
|
|
@ -2735,6 +2776,7 @@ CONFIG_USB_KAWETH=m
|
||||||
CONFIG_USB_PEGASUS=m
|
CONFIG_USB_PEGASUS=m
|
||||||
CONFIG_USB_RTL8150=m
|
CONFIG_USB_RTL8150=m
|
||||||
CONFIG_USB_RTL8152=m
|
CONFIG_USB_RTL8152=m
|
||||||
|
CONFIG_USB_LAN78XX=m
|
||||||
CONFIG_USB_USBNET=m
|
CONFIG_USB_USBNET=m
|
||||||
CONFIG_USB_NET_AX8817X=m
|
CONFIG_USB_NET_AX8817X=m
|
||||||
CONFIG_USB_NET_AX88179_178A=m
|
CONFIG_USB_NET_AX88179_178A=m
|
||||||
|
|
@ -2770,6 +2812,7 @@ CONFIG_USB_CDC_PHONET=m
|
||||||
CONFIG_USB_IPHETH=m
|
CONFIG_USB_IPHETH=m
|
||||||
CONFIG_USB_SIERRA_NET=m
|
CONFIG_USB_SIERRA_NET=m
|
||||||
CONFIG_USB_VL600=m
|
CONFIG_USB_VL600=m
|
||||||
|
CONFIG_USB_NET_CH9200=m
|
||||||
CONFIG_WLAN=y
|
CONFIG_WLAN=y
|
||||||
CONFIG_PCMCIA_RAYCS=m
|
CONFIG_PCMCIA_RAYCS=m
|
||||||
CONFIG_LIBERTAS_THINFIRM=m
|
CONFIG_LIBERTAS_THINFIRM=m
|
||||||
|
|
@ -3045,6 +3088,7 @@ CONFIG_IEEE802154_ATUSB=m
|
||||||
CONFIG_XEN_NETDEV_FRONTEND=y
|
CONFIG_XEN_NETDEV_FRONTEND=y
|
||||||
CONFIG_XEN_NETDEV_BACKEND=m
|
CONFIG_XEN_NETDEV_BACKEND=m
|
||||||
CONFIG_VMXNET3=m
|
CONFIG_VMXNET3=m
|
||||||
|
CONFIG_FUJITSU_ES=m
|
||||||
CONFIG_HYPERV_NET=m
|
CONFIG_HYPERV_NET=m
|
||||||
CONFIG_ISDN=y
|
CONFIG_ISDN=y
|
||||||
CONFIG_ISDN_I4L=m
|
CONFIG_ISDN_I4L=m
|
||||||
|
|
@ -3291,6 +3335,7 @@ CONFIG_TABLET_USB_HANWANG=m
|
||||||
CONFIG_TABLET_USB_KBTAB=m
|
CONFIG_TABLET_USB_KBTAB=m
|
||||||
CONFIG_TABLET_SERIAL_WACOM4=m
|
CONFIG_TABLET_SERIAL_WACOM4=m
|
||||||
CONFIG_INPUT_TOUCHSCREEN=y
|
CONFIG_INPUT_TOUCHSCREEN=y
|
||||||
|
CONFIG_TOUCHSCREEN_PROPERTIES=y
|
||||||
CONFIG_TOUCHSCREEN_88PM860X=m
|
CONFIG_TOUCHSCREEN_88PM860X=m
|
||||||
CONFIG_TOUCHSCREEN_ADS7846=m
|
CONFIG_TOUCHSCREEN_ADS7846=m
|
||||||
CONFIG_TOUCHSCREEN_AD7877=m
|
CONFIG_TOUCHSCREEN_AD7877=m
|
||||||
|
|
@ -3380,7 +3425,6 @@ CONFIG_INPUT_BMA150=m
|
||||||
CONFIG_INPUT_E3X0_BUTTON=m
|
CONFIG_INPUT_E3X0_BUTTON=m
|
||||||
CONFIG_INPUT_PCSPKR=m
|
CONFIG_INPUT_PCSPKR=m
|
||||||
CONFIG_INPUT_MAX77693_HAPTIC=m
|
CONFIG_INPUT_MAX77693_HAPTIC=m
|
||||||
CONFIG_INPUT_MAX77843_HAPTIC=m
|
|
||||||
CONFIG_INPUT_MAX8925_ONKEY=m
|
CONFIG_INPUT_MAX8925_ONKEY=m
|
||||||
CONFIG_INPUT_MAX8997_HAPTIC=m
|
CONFIG_INPUT_MAX8997_HAPTIC=m
|
||||||
CONFIG_INPUT_MC13783_PWRBUTTON=m
|
CONFIG_INPUT_MC13783_PWRBUTTON=m
|
||||||
|
|
@ -3510,6 +3554,7 @@ CONFIG_SERIAL_8250_FINTEK=m
|
||||||
CONFIG_SERIAL_KGDB_NMI=y
|
CONFIG_SERIAL_KGDB_NMI=y
|
||||||
CONFIG_SERIAL_MAX3100=m
|
CONFIG_SERIAL_MAX3100=m
|
||||||
CONFIG_SERIAL_MAX310X=y
|
CONFIG_SERIAL_MAX310X=y
|
||||||
|
CONFIG_SERIAL_UARTLITE=m
|
||||||
CONFIG_SERIAL_CORE=y
|
CONFIG_SERIAL_CORE=y
|
||||||
CONFIG_SERIAL_CORE_CONSOLE=y
|
CONFIG_SERIAL_CORE_CONSOLE=y
|
||||||
CONFIG_CONSOLE_POLL=y
|
CONFIG_CONSOLE_POLL=y
|
||||||
|
|
@ -3608,6 +3653,7 @@ CONFIG_I2C_MUX_GPIO=m
|
||||||
CONFIG_I2C_MUX_PCA9541=m
|
CONFIG_I2C_MUX_PCA9541=m
|
||||||
CONFIG_I2C_MUX_PCA954x=m
|
CONFIG_I2C_MUX_PCA954x=m
|
||||||
CONFIG_I2C_MUX_PINCTRL=m
|
CONFIG_I2C_MUX_PINCTRL=m
|
||||||
|
CONFIG_I2C_MUX_REG=m
|
||||||
CONFIG_I2C_HELPER_AUTO=y
|
CONFIG_I2C_HELPER_AUTO=y
|
||||||
CONFIG_I2C_SMBUS=m
|
CONFIG_I2C_SMBUS=m
|
||||||
CONFIG_I2C_ALGOBIT=m
|
CONFIG_I2C_ALGOBIT=m
|
||||||
|
|
@ -3650,6 +3696,7 @@ CONFIG_I2C_CBUS_GPIO=m
|
||||||
CONFIG_I2C_DESIGNWARE_CORE=m
|
CONFIG_I2C_DESIGNWARE_CORE=m
|
||||||
CONFIG_I2C_DESIGNWARE_PLATFORM=m
|
CONFIG_I2C_DESIGNWARE_PLATFORM=m
|
||||||
CONFIG_I2C_DESIGNWARE_PCI=m
|
CONFIG_I2C_DESIGNWARE_PCI=m
|
||||||
|
CONFIG_I2C_EMEV2=m
|
||||||
CONFIG_I2C_GPIO=m
|
CONFIG_I2C_GPIO=m
|
||||||
CONFIG_I2C_KEMPLD=m
|
CONFIG_I2C_KEMPLD=m
|
||||||
CONFIG_I2C_OCORES=m
|
CONFIG_I2C_OCORES=m
|
||||||
|
|
@ -3835,6 +3882,7 @@ CONFIG_GPIO_RDC321X=m
|
||||||
CONFIG_GPIO_MAX7301=m
|
CONFIG_GPIO_MAX7301=m
|
||||||
CONFIG_GPIO_MCP23S08=m
|
CONFIG_GPIO_MCP23S08=m
|
||||||
CONFIG_GPIO_MC33880=m
|
CONFIG_GPIO_MC33880=m
|
||||||
|
CONFIG_GPIO_ZX=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# USB GPIO expanders
|
# USB GPIO expanders
|
||||||
|
|
@ -4032,6 +4080,7 @@ CONFIG_SENSORS_LM25066=m
|
||||||
CONFIG_SENSORS_LTC2978=m
|
CONFIG_SENSORS_LTC2978=m
|
||||||
CONFIG_SENSORS_LTC2978_REGULATOR=y
|
CONFIG_SENSORS_LTC2978_REGULATOR=y
|
||||||
CONFIG_SENSORS_MAX16064=m
|
CONFIG_SENSORS_MAX16064=m
|
||||||
|
CONFIG_SENSORS_MAX20751=m
|
||||||
CONFIG_SENSORS_MAX34440=m
|
CONFIG_SENSORS_MAX34440=m
|
||||||
CONFIG_SENSORS_MAX8688=m
|
CONFIG_SENSORS_MAX8688=m
|
||||||
CONFIG_SENSORS_TPS40422=m
|
CONFIG_SENSORS_TPS40422=m
|
||||||
|
|
@ -4108,10 +4157,7 @@ CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
|
||||||
CONFIG_INTEL_SOC_DTS_THERMAL=m
|
CONFIG_INTEL_SOC_DTS_THERMAL=m
|
||||||
CONFIG_INT340X_THERMAL=m
|
CONFIG_INT340X_THERMAL=m
|
||||||
CONFIG_ACPI_THERMAL_REL=m
|
CONFIG_ACPI_THERMAL_REL=m
|
||||||
|
CONFIG_INTEL_PCH_THERMAL=m
|
||||||
#
|
|
||||||
# Texas Instruments thermal drivers
|
|
||||||
#
|
|
||||||
CONFIG_WATCHDOG=y
|
CONFIG_WATCHDOG=y
|
||||||
CONFIG_WATCHDOG_CORE=y
|
CONFIG_WATCHDOG_CORE=y
|
||||||
# CONFIG_WATCHDOG_NOWAYOUT is not set
|
# CONFIG_WATCHDOG_NOWAYOUT is not set
|
||||||
|
|
@ -4123,6 +4169,7 @@ CONFIG_SOFT_WATCHDOG=m
|
||||||
CONFIG_DA9052_WATCHDOG=m
|
CONFIG_DA9052_WATCHDOG=m
|
||||||
CONFIG_DA9055_WATCHDOG=m
|
CONFIG_DA9055_WATCHDOG=m
|
||||||
CONFIG_DA9063_WATCHDOG=m
|
CONFIG_DA9063_WATCHDOG=m
|
||||||
|
CONFIG_DA9062_WATCHDOG=m
|
||||||
CONFIG_MENF21BMC_WATCHDOG=m
|
CONFIG_MENF21BMC_WATCHDOG=m
|
||||||
CONFIG_WM831X_WATCHDOG=m
|
CONFIG_WM831X_WATCHDOG=m
|
||||||
CONFIG_WM8350_WATCHDOG=m
|
CONFIG_WM8350_WATCHDOG=m
|
||||||
|
|
@ -4231,6 +4278,7 @@ CONFIG_PMIC_DA9052=y
|
||||||
CONFIG_MFD_DA9052_SPI=y
|
CONFIG_MFD_DA9052_SPI=y
|
||||||
CONFIG_MFD_DA9052_I2C=y
|
CONFIG_MFD_DA9052_I2C=y
|
||||||
CONFIG_MFD_DA9055=y
|
CONFIG_MFD_DA9055=y
|
||||||
|
CONFIG_MFD_DA9062=m
|
||||||
CONFIG_MFD_DA9063=y
|
CONFIG_MFD_DA9063=y
|
||||||
CONFIG_MFD_DA9150=m
|
CONFIG_MFD_DA9150=m
|
||||||
CONFIG_MFD_DLN2=m
|
CONFIG_MFD_DLN2=m
|
||||||
|
|
@ -4243,6 +4291,9 @@ CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
|
||||||
CONFIG_LPC_ICH=m
|
CONFIG_LPC_ICH=m
|
||||||
CONFIG_LPC_SCH=m
|
CONFIG_LPC_SCH=m
|
||||||
CONFIG_INTEL_SOC_PMIC=y
|
CONFIG_INTEL_SOC_PMIC=y
|
||||||
|
CONFIG_MFD_INTEL_LPSS=m
|
||||||
|
CONFIG_MFD_INTEL_LPSS_ACPI=m
|
||||||
|
CONFIG_MFD_INTEL_LPSS_PCI=m
|
||||||
CONFIG_MFD_JANZ_CMODIO=m
|
CONFIG_MFD_JANZ_CMODIO=m
|
||||||
CONFIG_MFD_KEMPLD=m
|
CONFIG_MFD_KEMPLD=m
|
||||||
CONFIG_MFD_88PM800=m
|
CONFIG_MFD_88PM800=m
|
||||||
|
|
@ -4309,6 +4360,7 @@ CONFIG_MFD_ARIZONA_SPI=m
|
||||||
CONFIG_MFD_WM5102=y
|
CONFIG_MFD_WM5102=y
|
||||||
CONFIG_MFD_WM5110=y
|
CONFIG_MFD_WM5110=y
|
||||||
CONFIG_MFD_WM8997=y
|
CONFIG_MFD_WM8997=y
|
||||||
|
CONFIG_MFD_WM8998=y
|
||||||
CONFIG_MFD_WM8400=y
|
CONFIG_MFD_WM8400=y
|
||||||
CONFIG_MFD_WM831X=y
|
CONFIG_MFD_WM831X=y
|
||||||
CONFIG_MFD_WM831X_I2C=y
|
CONFIG_MFD_WM831X_I2C=y
|
||||||
|
|
@ -4335,6 +4387,7 @@ CONFIG_REGULATOR_BCM590XX=m
|
||||||
CONFIG_REGULATOR_DA903X=m
|
CONFIG_REGULATOR_DA903X=m
|
||||||
CONFIG_REGULATOR_DA9052=m
|
CONFIG_REGULATOR_DA9052=m
|
||||||
CONFIG_REGULATOR_DA9055=m
|
CONFIG_REGULATOR_DA9055=m
|
||||||
|
CONFIG_REGULATOR_DA9062=m
|
||||||
CONFIG_REGULATOR_DA9063=m
|
CONFIG_REGULATOR_DA9063=m
|
||||||
CONFIG_REGULATOR_DA9210=m
|
CONFIG_REGULATOR_DA9210=m
|
||||||
CONFIG_REGULATOR_DA9211=m
|
CONFIG_REGULATOR_DA9211=m
|
||||||
|
|
@ -4359,10 +4412,10 @@ CONFIG_REGULATOR_MAX8973=m
|
||||||
CONFIG_REGULATOR_MAX8997=m
|
CONFIG_REGULATOR_MAX8997=m
|
||||||
CONFIG_REGULATOR_MAX8998=m
|
CONFIG_REGULATOR_MAX8998=m
|
||||||
CONFIG_REGULATOR_MAX77693=m
|
CONFIG_REGULATOR_MAX77693=m
|
||||||
CONFIG_REGULATOR_MAX77843=m
|
|
||||||
CONFIG_REGULATOR_MC13XXX_CORE=m
|
CONFIG_REGULATOR_MC13XXX_CORE=m
|
||||||
CONFIG_REGULATOR_MC13783=m
|
CONFIG_REGULATOR_MC13783=m
|
||||||
CONFIG_REGULATOR_MC13892=m
|
CONFIG_REGULATOR_MC13892=m
|
||||||
|
CONFIG_REGULATOR_MT6311=m
|
||||||
CONFIG_REGULATOR_MT6397=m
|
CONFIG_REGULATOR_MT6397=m
|
||||||
CONFIG_REGULATOR_PALMAS=m
|
CONFIG_REGULATOR_PALMAS=m
|
||||||
CONFIG_REGULATOR_PCAP=m
|
CONFIG_REGULATOR_PCAP=m
|
||||||
|
|
@ -4632,13 +4685,8 @@ CONFIG_MEDIA_PCI_SUPPORT=y
|
||||||
# Media capture support
|
# Media capture support
|
||||||
#
|
#
|
||||||
CONFIG_VIDEO_MEYE=m
|
CONFIG_VIDEO_MEYE=m
|
||||||
|
CONFIG_VIDEO_SOLO6X10=m
|
||||||
#
|
CONFIG_VIDEO_TW68=m
|
||||||
# Media capture/analog TV support
|
|
||||||
#
|
|
||||||
CONFIG_VIDEO_IVTV=m
|
|
||||||
CONFIG_VIDEO_IVTV_ALSA=m
|
|
||||||
CONFIG_VIDEO_FB_IVTV=m
|
|
||||||
CONFIG_VIDEO_ZORAN=m
|
CONFIG_VIDEO_ZORAN=m
|
||||||
CONFIG_VIDEO_ZORAN_DC30=m
|
CONFIG_VIDEO_ZORAN_DC30=m
|
||||||
CONFIG_VIDEO_ZORAN_ZR36060=m
|
CONFIG_VIDEO_ZORAN_ZR36060=m
|
||||||
|
|
@ -4647,11 +4695,16 @@ CONFIG_VIDEO_ZORAN_DC10=m
|
||||||
CONFIG_VIDEO_ZORAN_LML33=m
|
CONFIG_VIDEO_ZORAN_LML33=m
|
||||||
CONFIG_VIDEO_ZORAN_LML33R10=m
|
CONFIG_VIDEO_ZORAN_LML33R10=m
|
||||||
CONFIG_VIDEO_ZORAN_AVS6EYES=m
|
CONFIG_VIDEO_ZORAN_AVS6EYES=m
|
||||||
|
|
||||||
|
#
|
||||||
|
# Media capture/analog TV support
|
||||||
|
#
|
||||||
|
CONFIG_VIDEO_IVTV=m
|
||||||
|
CONFIG_VIDEO_IVTV_ALSA=m
|
||||||
|
CONFIG_VIDEO_FB_IVTV=m
|
||||||
CONFIG_VIDEO_HEXIUM_GEMINI=m
|
CONFIG_VIDEO_HEXIUM_GEMINI=m
|
||||||
CONFIG_VIDEO_HEXIUM_ORION=m
|
CONFIG_VIDEO_HEXIUM_ORION=m
|
||||||
CONFIG_VIDEO_MXB=m
|
CONFIG_VIDEO_MXB=m
|
||||||
CONFIG_VIDEO_SOLO6X10=m
|
|
||||||
CONFIG_VIDEO_TW68=m
|
|
||||||
CONFIG_VIDEO_DT3155=m
|
CONFIG_VIDEO_DT3155=m
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -4703,6 +4756,7 @@ CONFIG_DVB_HOPPER=m
|
||||||
CONFIG_DVB_NGENE=m
|
CONFIG_DVB_NGENE=m
|
||||||
CONFIG_DVB_DDBRIDGE=m
|
CONFIG_DVB_DDBRIDGE=m
|
||||||
CONFIG_DVB_SMIPCIE=m
|
CONFIG_DVB_SMIPCIE=m
|
||||||
|
CONFIG_DVB_NETUP_UNIDVB=m
|
||||||
CONFIG_V4L_PLATFORM_DRIVERS=y
|
CONFIG_V4L_PLATFORM_DRIVERS=y
|
||||||
CONFIG_VIDEO_CAFE_CCIC=m
|
CONFIG_VIDEO_CAFE_CCIC=m
|
||||||
CONFIG_VIDEO_VIA_CAMERA=m
|
CONFIG_VIDEO_VIA_CAMERA=m
|
||||||
|
|
@ -4714,6 +4768,7 @@ CONFIG_VIDEO_SH_VEU=m
|
||||||
CONFIG_V4L_TEST_DRIVERS=y
|
CONFIG_V4L_TEST_DRIVERS=y
|
||||||
CONFIG_VIDEO_VIVID=m
|
CONFIG_VIDEO_VIVID=m
|
||||||
CONFIG_VIDEO_VIM2M=m
|
CONFIG_VIDEO_VIM2M=m
|
||||||
|
CONFIG_DVB_PLATFORM_DRIVERS=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Supported MMC/SDIO adapters
|
# Supported MMC/SDIO adapters
|
||||||
|
|
@ -4982,6 +5037,7 @@ CONFIG_DVB_AF9013=m
|
||||||
CONFIG_DVB_EC100=m
|
CONFIG_DVB_EC100=m
|
||||||
CONFIG_DVB_STV0367=m
|
CONFIG_DVB_STV0367=m
|
||||||
CONFIG_DVB_CXD2820R=m
|
CONFIG_DVB_CXD2820R=m
|
||||||
|
CONFIG_DVB_CXD2841ER=m
|
||||||
CONFIG_DVB_RTL2830=m
|
CONFIG_DVB_RTL2830=m
|
||||||
CONFIG_DVB_RTL2832=m
|
CONFIG_DVB_RTL2832=m
|
||||||
CONFIG_DVB_RTL2832_SDR=m
|
CONFIG_DVB_RTL2832_SDR=m
|
||||||
|
|
@ -5036,6 +5092,7 @@ CONFIG_DVB_TUNER_DIB0090=m
|
||||||
# SEC control devices for DVB-S
|
# SEC control devices for DVB-S
|
||||||
#
|
#
|
||||||
CONFIG_DVB_DRX39XYJ=m
|
CONFIG_DVB_DRX39XYJ=m
|
||||||
|
CONFIG_DVB_LNBH25=m
|
||||||
CONFIG_DVB_LNBP21=m
|
CONFIG_DVB_LNBP21=m
|
||||||
CONFIG_DVB_LNBP22=m
|
CONFIG_DVB_LNBP22=m
|
||||||
CONFIG_DVB_ISL6405=m
|
CONFIG_DVB_ISL6405=m
|
||||||
|
|
@ -5049,6 +5106,8 @@ CONFIG_DVB_TDA665x=m
|
||||||
CONFIG_DVB_IX2505V=m
|
CONFIG_DVB_IX2505V=m
|
||||||
CONFIG_DVB_M88RS2000=m
|
CONFIG_DVB_M88RS2000=m
|
||||||
CONFIG_DVB_AF9033=m
|
CONFIG_DVB_AF9033=m
|
||||||
|
CONFIG_DVB_HORUS3A=m
|
||||||
|
CONFIG_DVB_ASCOT2E=m
|
||||||
|
|
||||||
#
|
#
|
||||||
# Tools to develop new frontends
|
# Tools to develop new frontends
|
||||||
|
|
@ -5067,14 +5126,11 @@ CONFIG_INTEL_GTT=y
|
||||||
CONFIG_VGA_ARB=y
|
CONFIG_VGA_ARB=y
|
||||||
CONFIG_VGA_ARB_MAX_GPUS=16
|
CONFIG_VGA_ARB_MAX_GPUS=16
|
||||||
CONFIG_VGA_SWITCHEROO=y
|
CONFIG_VGA_SWITCHEROO=y
|
||||||
|
|
||||||
#
|
|
||||||
# Direct Rendering Manager
|
|
||||||
#
|
|
||||||
CONFIG_DRM=m
|
CONFIG_DRM=m
|
||||||
CONFIG_DRM_MIPI_DSI=y
|
CONFIG_DRM_MIPI_DSI=y
|
||||||
CONFIG_DRM_KMS_HELPER=m
|
CONFIG_DRM_KMS_HELPER=m
|
||||||
CONFIG_DRM_KMS_FB_HELPER=y
|
CONFIG_DRM_KMS_FB_HELPER=y
|
||||||
|
CONFIG_DRM_FBDEV_EMULATION=y
|
||||||
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
|
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
|
||||||
CONFIG_DRM_TTM=m
|
CONFIG_DRM_TTM=m
|
||||||
|
|
||||||
|
|
@ -5099,8 +5155,6 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
|
||||||
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
|
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
|
||||||
CONFIG_DRM_I810=m
|
CONFIG_DRM_I810=m
|
||||||
CONFIG_DRM_I915=m
|
CONFIG_DRM_I915=m
|
||||||
CONFIG_DRM_I915_KMS=y
|
|
||||||
CONFIG_DRM_I915_FBDEV=y
|
|
||||||
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
|
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
|
||||||
CONFIG_DRM_MGA=m
|
CONFIG_DRM_MGA=m
|
||||||
CONFIG_DRM_SIS=m
|
CONFIG_DRM_SIS=m
|
||||||
|
|
@ -5124,6 +5178,11 @@ CONFIG_DRM_PANEL=y
|
||||||
#
|
#
|
||||||
# Display Panels
|
# Display Panels
|
||||||
#
|
#
|
||||||
|
CONFIG_DRM_BRIDGE=y
|
||||||
|
|
||||||
|
#
|
||||||
|
# Display Interface Bridges
|
||||||
|
#
|
||||||
CONFIG_HSA_AMD=m
|
CONFIG_HSA_AMD=m
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -5237,6 +5296,7 @@ CONFIG_FB_AUO_K1900=m
|
||||||
CONFIG_FB_AUO_K1901=m
|
CONFIG_FB_AUO_K1901=m
|
||||||
CONFIG_FB_HYPERV=m
|
CONFIG_FB_HYPERV=m
|
||||||
CONFIG_FB_SIMPLE=y
|
CONFIG_FB_SIMPLE=y
|
||||||
|
CONFIG_FB_SM712=m
|
||||||
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
||||||
CONFIG_LCD_CLASS_DEVICE=m
|
CONFIG_LCD_CLASS_DEVICE=m
|
||||||
CONFIG_LCD_L4F00242T03=m
|
CONFIG_LCD_L4F00242T03=m
|
||||||
|
|
@ -5261,6 +5321,7 @@ CONFIG_BACKLIGHT_DA903X=m
|
||||||
CONFIG_BACKLIGHT_DA9052=m
|
CONFIG_BACKLIGHT_DA9052=m
|
||||||
CONFIG_BACKLIGHT_MAX8925=m
|
CONFIG_BACKLIGHT_MAX8925=m
|
||||||
CONFIG_BACKLIGHT_APPLE=m
|
CONFIG_BACKLIGHT_APPLE=m
|
||||||
|
CONFIG_BACKLIGHT_PM8941_WLED=m
|
||||||
CONFIG_BACKLIGHT_SAHARA=m
|
CONFIG_BACKLIGHT_SAHARA=m
|
||||||
CONFIG_BACKLIGHT_WM831X=m
|
CONFIG_BACKLIGHT_WM831X=m
|
||||||
CONFIG_BACKLIGHT_ADP5520=m
|
CONFIG_BACKLIGHT_ADP5520=m
|
||||||
|
|
@ -5511,7 +5572,6 @@ CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
|
||||||
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
|
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
|
||||||
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
|
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
|
||||||
CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
|
CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
|
||||||
CONFIG_SND_SOC_QCOM=m
|
|
||||||
CONFIG_SND_SOC_XTFPGA_I2S=m
|
CONFIG_SND_SOC_XTFPGA_I2S=m
|
||||||
CONFIG_SND_SOC_I2C_AND_SPI=m
|
CONFIG_SND_SOC_I2C_AND_SPI=m
|
||||||
|
|
||||||
|
|
@ -5538,8 +5598,10 @@ CONFIG_SND_SOC_CS4271_I2C=m
|
||||||
CONFIG_SND_SOC_CS4271_SPI=m
|
CONFIG_SND_SOC_CS4271_SPI=m
|
||||||
CONFIG_SND_SOC_CS42XX8=m
|
CONFIG_SND_SOC_CS42XX8=m
|
||||||
CONFIG_SND_SOC_CS42XX8_I2C=m
|
CONFIG_SND_SOC_CS42XX8_I2C=m
|
||||||
|
CONFIG_SND_SOC_CS4349=m
|
||||||
CONFIG_SND_SOC_HDMI_CODEC=m
|
CONFIG_SND_SOC_HDMI_CODEC=m
|
||||||
CONFIG_SND_SOC_ES8328=m
|
CONFIG_SND_SOC_ES8328=m
|
||||||
|
CONFIG_SND_SOC_GTM601=m
|
||||||
CONFIG_SND_SOC_MAX98090=m
|
CONFIG_SND_SOC_MAX98090=m
|
||||||
CONFIG_SND_SOC_PCM1681=m
|
CONFIG_SND_SOC_PCM1681=m
|
||||||
CONFIG_SND_SOC_PCM1792A=m
|
CONFIG_SND_SOC_PCM1792A=m
|
||||||
|
|
@ -5566,6 +5628,7 @@ CONFIG_SND_SOC_SSM2602_I2C=m
|
||||||
CONFIG_SND_SOC_SSM4567=m
|
CONFIG_SND_SOC_SSM4567=m
|
||||||
CONFIG_SND_SOC_STA32X=m
|
CONFIG_SND_SOC_STA32X=m
|
||||||
CONFIG_SND_SOC_STA350=m
|
CONFIG_SND_SOC_STA350=m
|
||||||
|
CONFIG_SND_SOC_STI_SAS=m
|
||||||
CONFIG_SND_SOC_TAS2552=m
|
CONFIG_SND_SOC_TAS2552=m
|
||||||
CONFIG_SND_SOC_TAS5086=m
|
CONFIG_SND_SOC_TAS5086=m
|
||||||
CONFIG_SND_SOC_TAS571X=m
|
CONFIG_SND_SOC_TAS571X=m
|
||||||
|
|
@ -5630,6 +5693,7 @@ CONFIG_HID_EMS_FF=m
|
||||||
CONFIG_HID_ELECOM=m
|
CONFIG_HID_ELECOM=m
|
||||||
CONFIG_HID_ELO=m
|
CONFIG_HID_ELO=m
|
||||||
CONFIG_HID_EZKEY=m
|
CONFIG_HID_EZKEY=m
|
||||||
|
CONFIG_HID_GEMBIRD=m
|
||||||
CONFIG_HID_HOLTEK=m
|
CONFIG_HID_HOLTEK=m
|
||||||
CONFIG_HOLTEK_FF=y
|
CONFIG_HOLTEK_FF=y
|
||||||
CONFIG_HID_GT683R=m
|
CONFIG_HID_GT683R=m
|
||||||
|
|
@ -5818,6 +5882,10 @@ CONFIG_USB_MUSB_DUAL_ROLE=y
|
||||||
#
|
#
|
||||||
# Platform Glue Layer
|
# Platform Glue Layer
|
||||||
#
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# MUSB DMA mode
|
||||||
|
#
|
||||||
CONFIG_MUSB_PIO_ONLY=y
|
CONFIG_MUSB_PIO_ONLY=y
|
||||||
CONFIG_USB_DWC3=m
|
CONFIG_USB_DWC3=m
|
||||||
CONFIG_USB_DWC3_ULPI=y
|
CONFIG_USB_DWC3_ULPI=y
|
||||||
|
|
@ -5829,11 +5897,6 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
|
||||||
# Platform Glue Driver Support
|
# Platform Glue Driver Support
|
||||||
#
|
#
|
||||||
CONFIG_USB_DWC3_PCI=m
|
CONFIG_USB_DWC3_PCI=m
|
||||||
|
|
||||||
#
|
|
||||||
# Debugging features
|
|
||||||
#
|
|
||||||
# CONFIG_USB_DWC3_DEBUG is not set
|
|
||||||
CONFIG_USB_DWC2=y
|
CONFIG_USB_DWC2=y
|
||||||
CONFIG_USB_DWC2_HOST=y
|
CONFIG_USB_DWC2_HOST=y
|
||||||
|
|
||||||
|
|
@ -6170,7 +6233,6 @@ CONFIG_LEDS_MENF21BMC=m
|
||||||
# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
|
# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
|
||||||
#
|
#
|
||||||
CONFIG_LEDS_BLINKM=m
|
CONFIG_LEDS_BLINKM=m
|
||||||
CONFIG_LEDS_PM8941_WLED=m
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# LED Triggers
|
# LED Triggers
|
||||||
|
|
@ -6198,11 +6260,8 @@ CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
|
||||||
CONFIG_INFINIBAND_ADDR_TRANS=y
|
CONFIG_INFINIBAND_ADDR_TRANS=y
|
||||||
CONFIG_INFINIBAND_MTHCA=m
|
CONFIG_INFINIBAND_MTHCA=m
|
||||||
# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
|
# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
|
||||||
CONFIG_INFINIBAND_IPATH=m
|
|
||||||
CONFIG_INFINIBAND_QIB=m
|
CONFIG_INFINIBAND_QIB=m
|
||||||
CONFIG_INFINIBAND_QIB_DCA=y
|
CONFIG_INFINIBAND_QIB_DCA=y
|
||||||
CONFIG_INFINIBAND_AMSO1100=m
|
|
||||||
# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
|
|
||||||
CONFIG_INFINIBAND_CXGB3=m
|
CONFIG_INFINIBAND_CXGB3=m
|
||||||
# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
|
# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
|
||||||
CONFIG_INFINIBAND_CXGB4=m
|
CONFIG_INFINIBAND_CXGB4=m
|
||||||
|
|
@ -6225,7 +6284,6 @@ CONFIG_EDAC=y
|
||||||
# CONFIG_EDAC_LEGACY_SYSFS is not set
|
# CONFIG_EDAC_LEGACY_SYSFS is not set
|
||||||
# CONFIG_EDAC_DEBUG is not set
|
# CONFIG_EDAC_DEBUG is not set
|
||||||
CONFIG_EDAC_DECODE_MCE=m
|
CONFIG_EDAC_DECODE_MCE=m
|
||||||
CONFIG_EDAC_MCE_INJ=m
|
|
||||||
CONFIG_EDAC_MM_EDAC=m
|
CONFIG_EDAC_MM_EDAC=m
|
||||||
CONFIG_EDAC_AMD64=m
|
CONFIG_EDAC_AMD64=m
|
||||||
# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
|
# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
|
||||||
|
|
@ -6370,16 +6428,17 @@ CONFIG_DMADEVICES=y
|
||||||
#
|
#
|
||||||
# DMA Devices
|
# DMA Devices
|
||||||
#
|
#
|
||||||
CONFIG_INTEL_MIC_X100_DMA=m
|
CONFIG_DMA_ENGINE=y
|
||||||
|
CONFIG_DMA_VIRTUAL_CHANNELS=m
|
||||||
|
CONFIG_DMA_ACPI=y
|
||||||
|
CONFIG_IDMA64=m
|
||||||
CONFIG_INTEL_IOATDMA=m
|
CONFIG_INTEL_IOATDMA=m
|
||||||
|
CONFIG_INTEL_MIC_X100_DMA=m
|
||||||
CONFIG_DW_DMAC_CORE=m
|
CONFIG_DW_DMAC_CORE=m
|
||||||
CONFIG_DW_DMAC=m
|
CONFIG_DW_DMAC=m
|
||||||
CONFIG_DW_DMAC_PCI=m
|
CONFIG_DW_DMAC_PCI=m
|
||||||
CONFIG_HSU_DMA=m
|
CONFIG_HSU_DMA=m
|
||||||
CONFIG_HSU_DMA_PCI=m
|
CONFIG_HSU_DMA_PCI=m
|
||||||
CONFIG_DMA_ENGINE=y
|
|
||||||
CONFIG_DMA_VIRTUAL_CHANNELS=m
|
|
||||||
CONFIG_DMA_ACPI=y
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# DMA Clients
|
# DMA Clients
|
||||||
|
|
@ -6458,6 +6517,8 @@ CONFIG_XEN_HAVE_PVMMU=y
|
||||||
CONFIG_XEN_EFI=y
|
CONFIG_XEN_EFI=y
|
||||||
CONFIG_XEN_AUTO_XLATE=y
|
CONFIG_XEN_AUTO_XLATE=y
|
||||||
CONFIG_XEN_ACPI=y
|
CONFIG_XEN_ACPI=y
|
||||||
|
CONFIG_XEN_SYMS=y
|
||||||
|
CONFIG_XEN_HAVE_VPMU=y
|
||||||
CONFIG_STAGING=y
|
CONFIG_STAGING=y
|
||||||
CONFIG_SLICOSS=m
|
CONFIG_SLICOSS=m
|
||||||
CONFIG_PRISM2_USB=m
|
CONFIG_PRISM2_USB=m
|
||||||
|
|
@ -6715,7 +6776,6 @@ CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
|
||||||
CONFIG_IIO_SIMPLE_DUMMY=m
|
CONFIG_IIO_SIMPLE_DUMMY=m
|
||||||
# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
|
# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
|
||||||
# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
|
# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
|
||||||
CONFIG_FB_SM7XX=m
|
|
||||||
CONFIG_FB_SM750=m
|
CONFIG_FB_SM750=m
|
||||||
CONFIG_FB_XGI=m
|
CONFIG_FB_XGI=m
|
||||||
CONFIG_FT1000=m
|
CONFIG_FT1000=m
|
||||||
|
|
@ -6752,11 +6812,19 @@ CONFIG_LIRC_SERIAL=m
|
||||||
CONFIG_LIRC_SERIAL_TRANSMITTER=y
|
CONFIG_LIRC_SERIAL_TRANSMITTER=y
|
||||||
CONFIG_LIRC_SIR=m
|
CONFIG_LIRC_SIR=m
|
||||||
CONFIG_LIRC_ZILOG=m
|
CONFIG_LIRC_ZILOG=m
|
||||||
|
CONFIG_STAGING_RDMA=y
|
||||||
|
CONFIG_INFINIBAND_AMSO1100=m
|
||||||
|
# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
|
||||||
|
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
|
||||||
|
CONFIG_INFINIBAND_IPATH=m
|
||||||
|
|
||||||
#
|
#
|
||||||
# Android
|
# Android
|
||||||
#
|
#
|
||||||
CONFIG_USB_WPAN_HCD=m
|
|
||||||
CONFIG_WIMAX_GDM72XX=m
|
CONFIG_WIMAX_GDM72XX=m
|
||||||
CONFIG_WIMAX_GDM72XX_QOS=y
|
CONFIG_WIMAX_GDM72XX_QOS=y
|
||||||
CONFIG_WIMAX_GDM72XX_K_MODE=y
|
CONFIG_WIMAX_GDM72XX_K_MODE=y
|
||||||
|
|
@ -6810,11 +6878,21 @@ CONFIG_FB_TFT_SSD1351=m
|
||||||
CONFIG_FB_TFT_ST7735R=m
|
CONFIG_FB_TFT_ST7735R=m
|
||||||
CONFIG_FB_TFT_TINYLCD=m
|
CONFIG_FB_TFT_TINYLCD=m
|
||||||
CONFIG_FB_TFT_TLS8204=m
|
CONFIG_FB_TFT_TLS8204=m
|
||||||
|
CONFIG_FB_TFT_UC1611=m
|
||||||
CONFIG_FB_TFT_UC1701=m
|
CONFIG_FB_TFT_UC1701=m
|
||||||
CONFIG_FB_TFT_UPD161704=m
|
CONFIG_FB_TFT_UPD161704=m
|
||||||
CONFIG_FB_TFT_WATTEROTT=m
|
CONFIG_FB_TFT_WATTEROTT=m
|
||||||
CONFIG_FB_FLEX=m
|
CONFIG_FB_FLEX=m
|
||||||
CONFIG_FB_TFT_FBTFT_DEVICE=m
|
CONFIG_FB_TFT_FBTFT_DEVICE=m
|
||||||
|
CONFIG_MOST=m
|
||||||
|
CONFIG_MOSTCORE=m
|
||||||
|
CONFIG_AIM_CDEV=m
|
||||||
|
CONFIG_AIM_NETWORK=m
|
||||||
|
CONFIG_AIM_SOUND=m
|
||||||
|
CONFIG_AIM_V4L2=m
|
||||||
|
CONFIG_HDM_DIM2=m
|
||||||
|
CONFIG_HDM_I2C=m
|
||||||
|
CONFIG_HDM_USB=m
|
||||||
CONFIG_X86_PLATFORM_DEVICES=y
|
CONFIG_X86_PLATFORM_DEVICES=y
|
||||||
CONFIG_ACER_WMI=m
|
CONFIG_ACER_WMI=m
|
||||||
CONFIG_ACERHDF=m
|
CONFIG_ACERHDF=m
|
||||||
|
|
@ -6869,6 +6947,7 @@ CONFIG_INTEL_RST=m
|
||||||
CONFIG_INTEL_SMARTCONNECT=m
|
CONFIG_INTEL_SMARTCONNECT=m
|
||||||
CONFIG_PVPANIC=m
|
CONFIG_PVPANIC=m
|
||||||
CONFIG_INTEL_PMC_IPC=m
|
CONFIG_INTEL_PMC_IPC=m
|
||||||
|
CONFIG_SURFACE_PRO3_BUTTON=m
|
||||||
CONFIG_CHROME_PLATFORMS=y
|
CONFIG_CHROME_PLATFORMS=y
|
||||||
CONFIG_CHROMEOS_LAPTOP=m
|
CONFIG_CHROMEOS_LAPTOP=m
|
||||||
CONFIG_CHROMEOS_PSTORE=m
|
CONFIG_CHROMEOS_PSTORE=m
|
||||||
|
|
@ -6990,8 +7069,8 @@ CONFIG_IIO_ST_ACCEL_3AXIS=m
|
||||||
CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
|
CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
|
||||||
CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
|
CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
|
||||||
CONFIG_KXSD9=m
|
CONFIG_KXSD9=m
|
||||||
CONFIG_MMA8452=m
|
|
||||||
CONFIG_KXCJK1013=m
|
CONFIG_KXCJK1013=m
|
||||||
|
CONFIG_MMA8452=m
|
||||||
CONFIG_MMA9551_CORE=m
|
CONFIG_MMA9551_CORE=m
|
||||||
CONFIG_MMA9551=m
|
CONFIG_MMA9551=m
|
||||||
CONFIG_MMA9553=m
|
CONFIG_MMA9553=m
|
||||||
|
|
@ -7134,8 +7213,11 @@ CONFIG_ISL29125=m
|
||||||
CONFIG_HID_SENSOR_ALS=m
|
CONFIG_HID_SENSOR_ALS=m
|
||||||
CONFIG_HID_SENSOR_PROX=m
|
CONFIG_HID_SENSOR_PROX=m
|
||||||
CONFIG_JSA1212=m
|
CONFIG_JSA1212=m
|
||||||
|
CONFIG_RPR0521=m
|
||||||
CONFIG_SENSORS_LM3533=m
|
CONFIG_SENSORS_LM3533=m
|
||||||
CONFIG_LTR501=m
|
CONFIG_LTR501=m
|
||||||
|
CONFIG_OPT3001=m
|
||||||
|
CONFIG_PA12203001=m
|
||||||
CONFIG_STK3310=m
|
CONFIG_STK3310=m
|
||||||
CONFIG_TCS3414=m
|
CONFIG_TCS3414=m
|
||||||
CONFIG_TCS3472=m
|
CONFIG_TCS3472=m
|
||||||
|
|
@ -7223,6 +7305,7 @@ CONFIG_VME_USER=m
|
||||||
CONFIG_VME_PIO2=m
|
CONFIG_VME_PIO2=m
|
||||||
CONFIG_PWM=y
|
CONFIG_PWM=y
|
||||||
CONFIG_PWM_SYSFS=y
|
CONFIG_PWM_SYSFS=y
|
||||||
|
CONFIG_PWM_CRC=y
|
||||||
CONFIG_PWM_LP3943=m
|
CONFIG_PWM_LP3943=m
|
||||||
CONFIG_PWM_LPSS=m
|
CONFIG_PWM_LPSS=m
|
||||||
CONFIG_PWM_LPSS_PCI=m
|
CONFIG_PWM_LPSS_PCI=m
|
||||||
|
|
@ -7255,7 +7338,12 @@ CONFIG_POWERCAP=y
|
||||||
CONFIG_INTEL_RAPL=m
|
CONFIG_INTEL_RAPL=m
|
||||||
CONFIG_MCB=m
|
CONFIG_MCB=m
|
||||||
CONFIG_MCB_PCI=m
|
CONFIG_MCB_PCI=m
|
||||||
|
|
||||||
|
#
|
||||||
|
# Performance monitor support
|
||||||
|
#
|
||||||
CONFIG_RAS=y
|
CONFIG_RAS=y
|
||||||
|
CONFIG_AMD_MCE_INJ=m
|
||||||
CONFIG_THUNDERBOLT=m
|
CONFIG_THUNDERBOLT=m
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -7265,8 +7353,10 @@ CONFIG_THUNDERBOLT=m
|
||||||
CONFIG_LIBNVDIMM=y
|
CONFIG_LIBNVDIMM=y
|
||||||
CONFIG_BLK_DEV_PMEM=m
|
CONFIG_BLK_DEV_PMEM=m
|
||||||
CONFIG_ND_BLK=m
|
CONFIG_ND_BLK=m
|
||||||
|
CONFIG_ND_CLAIM=y
|
||||||
CONFIG_ND_BTT=m
|
CONFIG_ND_BTT=m
|
||||||
CONFIG_BTT=y
|
CONFIG_BTT=y
|
||||||
|
CONFIG_NVMEM=m
|
||||||
|
|
||||||
#
|
#
|
||||||
# Firmware Drivers
|
# Firmware Drivers
|
||||||
|
|
@ -7301,7 +7391,7 @@ CONFIG_DCACHE_WORD_ACCESS=y
|
||||||
# CONFIG_EXT2_FS is not set
|
# CONFIG_EXT2_FS is not set
|
||||||
# CONFIG_EXT3_FS is not set
|
# CONFIG_EXT3_FS is not set
|
||||||
CONFIG_EXT4_FS=y
|
CONFIG_EXT4_FS=y
|
||||||
CONFIG_EXT4_USE_FOR_EXT23=y
|
CONFIG_EXT4_USE_FOR_EXT2=y
|
||||||
CONFIG_EXT4_FS_POSIX_ACL=y
|
CONFIG_EXT4_FS_POSIX_ACL=y
|
||||||
CONFIG_EXT4_FS_SECURITY=y
|
CONFIG_EXT4_FS_SECURITY=y
|
||||||
CONFIG_EXT4_ENCRYPTION=m
|
CONFIG_EXT4_ENCRYPTION=m
|
||||||
|
|
@ -7736,7 +7826,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
|
||||||
CONFIG_TORTURE_TEST=m
|
CONFIG_TORTURE_TEST=m
|
||||||
# CONFIG_RCU_TORTURE_TEST is not set
|
# CONFIG_RCU_TORTURE_TEST is not set
|
||||||
CONFIG_RCU_CPU_STALL_TIMEOUT=60
|
CONFIG_RCU_CPU_STALL_TIMEOUT=60
|
||||||
# CONFIG_RCU_CPU_STALL_INFO is not set
|
|
||||||
# CONFIG_RCU_TRACE is not set
|
# CONFIG_RCU_TRACE is not set
|
||||||
# CONFIG_RCU_EQS_DEBUG is not set
|
# CONFIG_RCU_EQS_DEBUG is not set
|
||||||
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
|
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
|
||||||
|
|
@ -7820,6 +7909,7 @@ CONFIG_TEST_BPF=m
|
||||||
CONFIG_TEST_FIRMWARE=m
|
CONFIG_TEST_FIRMWARE=m
|
||||||
CONFIG_TEST_UDELAY=m
|
CONFIG_TEST_UDELAY=m
|
||||||
CONFIG_MEMTEST=y
|
CONFIG_MEMTEST=y
|
||||||
|
CONFIG_TEST_STATIC_KEYS=m
|
||||||
# CONFIG_SAMPLES is not set
|
# CONFIG_SAMPLES is not set
|
||||||
CONFIG_HAVE_ARCH_KGDB=y
|
CONFIG_HAVE_ARCH_KGDB=y
|
||||||
CONFIG_KGDB=y
|
CONFIG_KGDB=y
|
||||||
|
|
@ -7901,7 +7991,6 @@ CONFIG_SECURITY_APPARMOR=y
|
||||||
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
|
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
|
||||||
CONFIG_SECURITY_APPARMOR_HASH=y
|
CONFIG_SECURITY_APPARMOR_HASH=y
|
||||||
CONFIG_SECURITY_YAMA=y
|
CONFIG_SECURITY_YAMA=y
|
||||||
CONFIG_SECURITY_YAMA_STACKED=y
|
|
||||||
CONFIG_INTEGRITY=y
|
CONFIG_INTEGRITY=y
|
||||||
CONFIG_INTEGRITY_SIGNATURE=y
|
CONFIG_INTEGRITY_SIGNATURE=y
|
||||||
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
|
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
|
||||||
|
|
@ -7928,7 +8017,6 @@ CONFIG_EVM_EXTRA_SMACK_XATTRS=y
|
||||||
# CONFIG_DEFAULT_SECURITY_SMACK is not set
|
# CONFIG_DEFAULT_SECURITY_SMACK is not set
|
||||||
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
|
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
|
||||||
CONFIG_DEFAULT_SECURITY_APPARMOR=y
|
CONFIG_DEFAULT_SECURITY_APPARMOR=y
|
||||||
# CONFIG_DEFAULT_SECURITY_YAMA is not set
|
|
||||||
# CONFIG_DEFAULT_SECURITY_DAC is not set
|
# CONFIG_DEFAULT_SECURITY_DAC is not set
|
||||||
CONFIG_DEFAULT_SECURITY="apparmor"
|
CONFIG_DEFAULT_SECURITY="apparmor"
|
||||||
CONFIG_XOR_BLOCKS=m
|
CONFIG_XOR_BLOCKS=m
|
||||||
|
|
@ -7964,6 +8052,7 @@ CONFIG_CRYPTO_USER=m
|
||||||
CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
|
CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
|
||||||
CONFIG_CRYPTO_GF128MUL=m
|
CONFIG_CRYPTO_GF128MUL=m
|
||||||
CONFIG_CRYPTO_NULL=m
|
CONFIG_CRYPTO_NULL=m
|
||||||
|
CONFIG_CRYPTO_NULL2=y
|
||||||
CONFIG_CRYPTO_PCRYPT=m
|
CONFIG_CRYPTO_PCRYPT=m
|
||||||
CONFIG_CRYPTO_WORKQUEUE=y
|
CONFIG_CRYPTO_WORKQUEUE=y
|
||||||
CONFIG_CRYPTO_CRYPTD=m
|
CONFIG_CRYPTO_CRYPTD=m
|
||||||
|
|
@ -8012,6 +8101,7 @@ CONFIG_CRYPTO_CRCT10DIF=y
|
||||||
CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
|
CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
|
||||||
CONFIG_CRYPTO_GHASH=m
|
CONFIG_CRYPTO_GHASH=m
|
||||||
CONFIG_CRYPTO_POLY1305=m
|
CONFIG_CRYPTO_POLY1305=m
|
||||||
|
CONFIG_CRYPTO_POLY1305_X86_64=m
|
||||||
CONFIG_CRYPTO_MD4=m
|
CONFIG_CRYPTO_MD4=m
|
||||||
CONFIG_CRYPTO_MD5=y
|
CONFIG_CRYPTO_MD5=y
|
||||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||||
|
|
@ -8057,6 +8147,7 @@ CONFIG_CRYPTO_KHAZAD=m
|
||||||
CONFIG_CRYPTO_SALSA20=m
|
CONFIG_CRYPTO_SALSA20=m
|
||||||
CONFIG_CRYPTO_SALSA20_X86_64=m
|
CONFIG_CRYPTO_SALSA20_X86_64=m
|
||||||
CONFIG_CRYPTO_CHACHA20=m
|
CONFIG_CRYPTO_CHACHA20=m
|
||||||
|
CONFIG_CRYPTO_CHACHA20_X86_64=m
|
||||||
CONFIG_CRYPTO_SEED=m
|
CONFIG_CRYPTO_SEED=m
|
||||||
CONFIG_CRYPTO_SERPENT=m
|
CONFIG_CRYPTO_SERPENT=m
|
||||||
CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
|
CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
|
||||||
|
|
@ -8104,12 +8195,20 @@ CONFIG_CRYPTO_DEV_CCP_DD=m
|
||||||
CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
|
CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
|
||||||
CONFIG_CRYPTO_DEV_QAT=m
|
CONFIG_CRYPTO_DEV_QAT=m
|
||||||
CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
|
CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
|
||||||
|
CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
|
||||||
CONFIG_ASYMMETRIC_KEY_TYPE=y
|
CONFIG_ASYMMETRIC_KEY_TYPE=y
|
||||||
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
|
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
|
||||||
CONFIG_PUBLIC_KEY_ALGO_RSA=y
|
CONFIG_PUBLIC_KEY_ALGO_RSA=y
|
||||||
CONFIG_X509_CERTIFICATE_PARSER=y
|
CONFIG_X509_CERTIFICATE_PARSER=y
|
||||||
CONFIG_PKCS7_MESSAGE_PARSER=m
|
CONFIG_PKCS7_MESSAGE_PARSER=y
|
||||||
CONFIG_PKCS7_TEST_KEY=m
|
CONFIG_PKCS7_TEST_KEY=m
|
||||||
|
CONFIG_SIGNED_PE_FILE_VERIFICATION=y
|
||||||
|
|
||||||
|
#
|
||||||
|
# Certificates for signature checking
|
||||||
|
#
|
||||||
|
CONFIG_SYSTEM_TRUSTED_KEYRING=y
|
||||||
|
CONFIG_SYSTEM_TRUSTED_KEYS=""
|
||||||
CONFIG_HAVE_KVM=y
|
CONFIG_HAVE_KVM=y
|
||||||
CONFIG_HAVE_KVM_IRQCHIP=y
|
CONFIG_HAVE_KVM_IRQCHIP=y
|
||||||
CONFIG_HAVE_KVM_IRQFD=y
|
CONFIG_HAVE_KVM_IRQFD=y
|
||||||
|
|
@ -8145,7 +8244,6 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y
|
||||||
CONFIG_GENERIC_PCI_IOMAP=y
|
CONFIG_GENERIC_PCI_IOMAP=y
|
||||||
CONFIG_GENERIC_IOMAP=y
|
CONFIG_GENERIC_IOMAP=y
|
||||||
CONFIG_GENERIC_IO=y
|
CONFIG_GENERIC_IO=y
|
||||||
CONFIG_PERCPU_RWSEM=y
|
|
||||||
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
|
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
|
||||||
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
|
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
|
||||||
CONFIG_CRC_CCITT=m
|
CONFIG_CRC_CCITT=m
|
||||||
|
|
@ -8198,6 +8296,7 @@ CONFIG_TEXTSEARCH=y
|
||||||
CONFIG_TEXTSEARCH_KMP=m
|
CONFIG_TEXTSEARCH_KMP=m
|
||||||
CONFIG_TEXTSEARCH_BM=m
|
CONFIG_TEXTSEARCH_BM=m
|
||||||
CONFIG_TEXTSEARCH_FSM=m
|
CONFIG_TEXTSEARCH_FSM=m
|
||||||
|
CONFIG_BTREE=y
|
||||||
CONFIG_INTERVAL_TREE=y
|
CONFIG_INTERVAL_TREE=y
|
||||||
CONFIG_ASSOCIATIVE_ARRAY=y
|
CONFIG_ASSOCIATIVE_ARRAY=y
|
||||||
CONFIG_HAS_IOMEM=y
|
CONFIG_HAS_IOMEM=y
|
||||||
|
|
@ -8211,7 +8310,6 @@ CONFIG_GLOB=y
|
||||||
CONFIG_NLATTR=y
|
CONFIG_NLATTR=y
|
||||||
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
|
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
|
||||||
CONFIG_LRU_CACHE=m
|
CONFIG_LRU_CACHE=m
|
||||||
CONFIG_AVERAGE=y
|
|
||||||
CONFIG_CLZ_TAB=y
|
CONFIG_CLZ_TAB=y
|
||||||
CONFIG_CORDIC=m
|
CONFIG_CORDIC=m
|
||||||
CONFIG_DDR=y
|
CONFIG_DDR=y
|
||||||
|
|
@ -8223,5 +8321,7 @@ CONFIG_FONT_SUPPORT=y
|
||||||
# CONFIG_FONTS is not set
|
# CONFIG_FONTS is not set
|
||||||
CONFIG_FONT_8x8=y
|
CONFIG_FONT_8x8=y
|
||||||
CONFIG_FONT_8x16=y
|
CONFIG_FONT_8x16=y
|
||||||
|
# CONFIG_SG_SPLIT is not set
|
||||||
CONFIG_ARCH_HAS_SG_CHAIN=y
|
CONFIG_ARCH_HAS_SG_CHAIN=y
|
||||||
CONFIG_ARCH_HAS_PMEM_API=y
|
CONFIG_ARCH_HAS_PMEM_API=y
|
||||||
|
CONFIG_ARCH_HAS_MMIO_FLUSH=y
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
(define-module (gnu packages linux)
|
(define-module (gnu packages linux)
|
||||||
#:use-module ((guix licenses)
|
#:use-module ((guix licenses)
|
||||||
#:hide (zlib))
|
#:hide (zlib openssl))
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages gcc)
|
#:use-module (gnu packages gcc)
|
||||||
|
|
@ -57,6 +57,7 @@
|
||||||
#:use-module (gnu packages asciidoc)
|
#:use-module (gnu packages asciidoc)
|
||||||
#:use-module (gnu packages readline)
|
#:use-module (gnu packages readline)
|
||||||
#:use-module (gnu packages calendar)
|
#:use-module (gnu packages calendar)
|
||||||
|
#:use-module (gnu packages tls)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
|
|
@ -210,7 +211,7 @@ for SYSTEM, or #f if there is no configuration for SYSTEM."
|
||||||
#f)))
|
#f)))
|
||||||
|
|
||||||
(define-public linux-libre
|
(define-public linux-libre
|
||||||
(let* ((version "4.2.3")
|
(let* ((version "4.3.2")
|
||||||
(build-phase
|
(build-phase
|
||||||
'(lambda* (#:key system inputs #:allow-other-keys #:rest args)
|
'(lambda* (#:key system inputs #:allow-other-keys #:rest args)
|
||||||
;; Apply the neat patch.
|
;; Apply the neat patch.
|
||||||
|
|
@ -220,6 +221,7 @@ for SYSTEM, or #f if there is no configuration for SYSTEM."
|
||||||
(let ((arch (car (string-split system #\-))))
|
(let ((arch (car (string-split system #\-))))
|
||||||
(setenv "ARCH"
|
(setenv "ARCH"
|
||||||
(cond ((string=? arch "i686") "i386")
|
(cond ((string=? arch "i686") "i386")
|
||||||
|
((string=? arch "mips64el") "mips")
|
||||||
(else arch)))
|
(else arch)))
|
||||||
(format #t "`ARCH' set to `~a'~%" (getenv "ARCH")))
|
(format #t "`ARCH' set to `~a'~%" (getenv "ARCH")))
|
||||||
|
|
||||||
|
|
@ -266,7 +268,7 @@ for SYSTEM, or #f if there is no configuration for SYSTEM."
|
||||||
(for-each (lambda (file)
|
(for-each (lambda (file)
|
||||||
(copy-file file
|
(copy-file file
|
||||||
(string-append out "/" (basename file))))
|
(string-append out "/" (basename file))))
|
||||||
(find-files "." "^(bzImage|System\\.map)$"))
|
(find-files "." "^(bzImage|vmlinuz|System\\.map)$"))
|
||||||
(copy-file ".config" (string-append out "/config"))
|
(copy-file ".config" (string-append out "/config"))
|
||||||
(zero? (system* "make"
|
(zero? (system* "make"
|
||||||
(string-append "DEPMOD=" mit "/sbin/depmod")
|
(string-append "DEPMOD=" mit "/sbin/depmod")
|
||||||
|
|
@ -283,10 +285,12 @@ for SYSTEM, or #f if there is no configuration for SYSTEM."
|
||||||
(uri (linux-libre-urls version))
|
(uri (linux-libre-urls version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1xpx32k6bzxqg5y8lyaana97jjcli00iyqklh5fdhirfvjb9dimd"))))
|
"0d87jbmplv36kxq40k44zh3sj82qp79lf8n4by7jb2wvyk06rvfg"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
(supported-systems '("x86_64-linux" "i686-linux"))
|
||||||
(native-inputs `(("perl" ,perl)
|
(native-inputs `(("perl" ,perl)
|
||||||
("bc" ,bc)
|
("bc" ,bc)
|
||||||
|
("openssl" ,openssl)
|
||||||
("module-init-tools" ,module-init-tools)
|
("module-init-tools" ,module-init-tools)
|
||||||
("patch/freedo+gnu" ,%boot-logo-patch)
|
("patch/freedo+gnu" ,%boot-logo-patch)
|
||||||
|
|
||||||
|
|
@ -445,8 +449,9 @@ providing the system administrator with some help in common tasks.")
|
||||||
("net-base" ,net-base))) ;for tests
|
("net-base" ,net-base))) ;for tests
|
||||||
(home-page "https://www.kernel.org/pub/linux/utils/util-linux/")
|
(home-page "https://www.kernel.org/pub/linux/utils/util-linux/")
|
||||||
(synopsis "Collection of utilities for the Linux kernel")
|
(synopsis "Collection of utilities for the Linux kernel")
|
||||||
(description
|
(description "Util-linux is a diverse collection of Linux kernel
|
||||||
"Util-linux is a random collection of utilities for the Linux kernel.")
|
utilities. It provides dmesg and includes tools for working with filesystems,
|
||||||
|
block devices, UUIDs, TTYs, and many other tools.")
|
||||||
|
|
||||||
;; Note that util-linux doesn't use the same license for all the
|
;; Note that util-linux doesn't use the same license for all the
|
||||||
;; code. GPLv2+ is the default license for a code without an
|
;; code. GPLv2+ is the default license for a code without an
|
||||||
|
|
@ -542,7 +547,7 @@ slabtop, and skill.")
|
||||||
(arguments
|
(arguments
|
||||||
'(;; util-linux is not the preferred source for some of the libraries and
|
'(;; util-linux is not the preferred source for some of the libraries and
|
||||||
;; commands, so disable them (see, e.g.,
|
;; commands, so disable them (see, e.g.,
|
||||||
;; <http://git.buildroot.net/buildroot/commit/?id=e1ffc2f791b336339909c90559b7db40b455f172>.)
|
;; <http://git.buildroot.net/buildroot/commit/?id=e1ffc2f791b33633>.)
|
||||||
#:configure-flags '("--disable-libblkid"
|
#:configure-flags '("--disable-libblkid"
|
||||||
"--disable-libuuid" "--disable-uuidd"
|
"--disable-libuuid" "--disable-uuidd"
|
||||||
"--disable-fsck"
|
"--disable-fsck"
|
||||||
|
|
@ -1361,7 +1366,7 @@ file system is as easy as logging into the server with an SSH client.")
|
||||||
(define-public numactl
|
(define-public numactl
|
||||||
(package
|
(package
|
||||||
(name "numactl")
|
(name "numactl")
|
||||||
(version "2.0.9")
|
(version "2.0.11")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -1370,35 +1375,13 @@ file system is as easy as logging into the server with an SSH client.")
|
||||||
".tar.gz"))
|
".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"073myxlyyhgxh1w3r757ajixb7s2k69czc3r0g12c3scq7k3784w"))))
|
"0qbqa9gac2vlahrngi553hws2mqgqdwv2lc69a3yx4gq6l90j325"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:phases (alist-replace
|
'(;; There's a 'test' target, but it requires NUMA support in the kernel
|
||||||
'configure
|
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
;; There's no 'configure' script, just a raw makefile.
|
|
||||||
(substitute* "Makefile"
|
|
||||||
(("^prefix := .*$")
|
|
||||||
(string-append "prefix := " (assoc-ref outputs "out")
|
|
||||||
"\n"))
|
|
||||||
(("^libdir := .*$")
|
|
||||||
;; By default the thing tries to install under
|
|
||||||
;; $prefix/lib64 when on a 64-bit platform.
|
|
||||||
(string-append "libdir := $(prefix)/lib\n"))))
|
|
||||||
%standard-phases)
|
|
||||||
|
|
||||||
#:make-flags (list
|
|
||||||
;; By default the thing tries to use 'cc'.
|
|
||||||
"CC=gcc"
|
|
||||||
|
|
||||||
;; Make sure programs have an RPATH so they can find
|
|
||||||
;; libnuma.so.
|
|
||||||
(string-append "LDLIBS=-Wl,-rpath="
|
|
||||||
(assoc-ref %outputs "out") "/lib"))
|
|
||||||
|
|
||||||
;; There's a 'test' target, but it requires NUMA support in the kernel
|
|
||||||
;; to run, which we can't assume to have.
|
;; to run, which we can't assume to have.
|
||||||
#:tests? #f))
|
#:tests? #f))
|
||||||
|
|
||||||
(home-page "http://oss.sgi.com/projects/libnuma/")
|
(home-page "http://oss.sgi.com/projects/libnuma/")
|
||||||
(synopsis "Tools for non-uniform memory access (NUMA) machines")
|
(synopsis "Tools for non-uniform memory access (NUMA) machines")
|
||||||
(description
|
(description
|
||||||
|
|
@ -1540,7 +1523,7 @@ from the module-init-tools project.")
|
||||||
;; The post-systemd fork, maintained by Gentoo.
|
;; The post-systemd fork, maintained by Gentoo.
|
||||||
(package
|
(package
|
||||||
(name "eudev")
|
(name "eudev")
|
||||||
(version "2.1.1")
|
(version "3.1.5")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -1548,55 +1531,15 @@ from the module-init-tools project.")
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0shf5vqiz9fdxl95aa1a8vh0xjxwim3psc39wr2xr8lnahf11vva"))
|
"0akg9gcc3c2p56xbhlvbybqavcprly5q0bvk655zwl6d62j8an7p"))
|
||||||
(patches (list (search-patch "eudev-rules-directory.patch")))
|
(patches (list (search-patch "eudev-rules-directory.patch")))))
|
||||||
(modules '((guix build utils)))
|
|
||||||
(snippet
|
|
||||||
;; 'configure' checks uses <linux/btrfs.h> as an indication of
|
|
||||||
;; whether Linux headers are available, but it doesn't actually
|
|
||||||
;; use it, and our 'linux-libre-headers' package doesn't
|
|
||||||
;; provide it. So just remove that.
|
|
||||||
'(substitute* "configure"
|
|
||||||
(("linux/btrfs\\.h")
|
|
||||||
"")))))
|
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)
|
`(("pkg-config" ,pkg-config)
|
||||||
("gperf" ,gperf)
|
("perl" ,perl)
|
||||||
("glib" ,glib "bin") ; glib-genmarshal, etc.
|
("gperf" ,gperf)))
|
||||||
("perl" ,perl) ; for the tests
|
|
||||||
("python" ,python-2))) ; ditto
|
|
||||||
(inputs
|
(inputs
|
||||||
`(("kmod" ,kmod)
|
`(("kmod" ,kmod)))
|
||||||
("pciutils" ,pciutils)
|
|
||||||
("usbutils" ,usbutils)
|
|
||||||
("util-linux" ,util-linux)
|
|
||||||
("glib" ,glib)
|
|
||||||
("gobject-introspection" ,gobject-introspection)))
|
|
||||||
(arguments
|
|
||||||
`(#:configure-flags (list "--enable-libkmod"
|
|
||||||
|
|
||||||
(string-append
|
|
||||||
"--with-pci-ids-path="
|
|
||||||
(assoc-ref %build-inputs "pciutils")
|
|
||||||
"/share/pci.ids.gz")
|
|
||||||
|
|
||||||
"--with-firmware-path=/no/firmware"
|
|
||||||
|
|
||||||
;; Work around undefined reference to
|
|
||||||
;; 'mq_getattr' in sc-daemon.c.
|
|
||||||
"LDFLAGS=-lrt")
|
|
||||||
#:phases
|
|
||||||
(alist-cons-before
|
|
||||||
'build 'pre-build
|
|
||||||
;; The program 'g-ir-scanner' (part of the package
|
|
||||||
;; 'gobject-introspection'), to generate .gir files, makes some
|
|
||||||
;; library pre-processing. During that phase it looks for the C
|
|
||||||
;; compiler as either 'cc' or as defined by the environment variable
|
|
||||||
;; 'CC' (with code in 'giscanner/dumper.py').
|
|
||||||
(lambda* _
|
|
||||||
(setenv "CC" "gcc"))
|
|
||||||
%standard-phases)))
|
|
||||||
(home-page "http://www.gentoo.org/proj/en/eudev/")
|
(home-page "http://www.gentoo.org/proj/en/eudev/")
|
||||||
(synopsis "Userspace device management")
|
(synopsis "Userspace device management")
|
||||||
(description "Udev is a daemon which dynamically creates and removes
|
(description "Udev is a daemon which dynamically creates and removes
|
||||||
|
|
@ -2327,7 +2270,7 @@ applications.")
|
||||||
(define-public bluez
|
(define-public bluez
|
||||||
(package
|
(package
|
||||||
(name "bluez")
|
(name "bluez")
|
||||||
(version "5.30")
|
(version "5.35")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
|
@ -2335,7 +2278,9 @@ applications.")
|
||||||
version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0b1qbnq1xzcdw5rajg9yyg31bf21jnff0n6gnf1snz89bbdllfhy"))))
|
"1qphz25hganfnd5ipfscbj7s70anv5favmwqmi9ig2saciaf1zhs"))
|
||||||
|
(patches
|
||||||
|
(list (search-patch "bluez-tests.patch")))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:configure-flags
|
'(#:configure-flags
|
||||||
|
|
@ -2418,3 +2363,46 @@ id=0B7CLI-REKbE3VTdaa0EzTkhYdU0")
|
||||||
"This package provides a FUSE-based file system that provides read and
|
"This package provides a FUSE-based file system that provides read and
|
||||||
write access to exFAT devices.")
|
write access to exFAT devices.")
|
||||||
(license gpl2+)))
|
(license gpl2+)))
|
||||||
|
|
||||||
|
(define-public gpm
|
||||||
|
(package
|
||||||
|
(name "gpm")
|
||||||
|
(version "1.20.7")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"http://www.nico.schottelius.org/software/gpm/archives/gpm-"
|
||||||
|
version ".tar.bz2"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
'(#:phases (modify-phases %standard-phases
|
||||||
|
(add-before 'configure 'bootstrap
|
||||||
|
(lambda _
|
||||||
|
;; The tarball was not generated with 'make dist' so we
|
||||||
|
;; need to bootstrap things ourselves.
|
||||||
|
(and (zero? (system* "./autogen.sh"))
|
||||||
|
(begin
|
||||||
|
(patch-makefile-SHELL "Makefile.include.in")
|
||||||
|
#t)))))
|
||||||
|
|
||||||
|
;; Make sure programs find libgpm.so.
|
||||||
|
#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath="
|
||||||
|
(assoc-ref %outputs "out")
|
||||||
|
"/lib"))))
|
||||||
|
(native-inputs
|
||||||
|
`(("texinfo" ,texinfo)
|
||||||
|
("bison" ,bison)
|
||||||
|
("flex" ,flex)
|
||||||
|
("autoconf" ,autoconf)
|
||||||
|
("automake" ,automake)
|
||||||
|
("libtool" ,libtool)))
|
||||||
|
(home-page "http://www.nico.schottelius.org/software/gpm/")
|
||||||
|
(synopsis "Mouse support for the Linux console")
|
||||||
|
(description
|
||||||
|
"The GPM (general-purpose mouse) daemon is a mouse server for
|
||||||
|
applications running on the Linux console. It allows users to select items
|
||||||
|
and copy/paste text in the console and in xterm.")
|
||||||
|
(license gpl2+)))
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue