Merge branch 'master' into core-updates
This commit is contained in:
commit
d1a914082b
|
@ -17,13 +17,20 @@
|
|||
(eval . (put 'call-with-prompt 'scheme-indent-function 1))
|
||||
(eval . (put 'test-assert 'scheme-indent-function 1))
|
||||
(eval . (put 'test-assertm 'scheme-indent-function 1))
|
||||
(eval . (put 'test-equalm 'scheme-indent-function 1))
|
||||
(eval . (put 'test-equal 'scheme-indent-function 1))
|
||||
(eval . (put 'test-eq 'scheme-indent-function 1))
|
||||
(eval . (put 'call-with-input-string 'scheme-indent-function 1))
|
||||
(eval . (put 'guard 'scheme-indent-function 1))
|
||||
(eval . (put 'lambda* 'scheme-indent-function 1))
|
||||
(eval . (put 'substitute* 'scheme-indent-function 1))
|
||||
|
||||
;; 'modify-phases' and its keywords.
|
||||
(eval . (put 'modify-phases 'scheme-indent-function 1))
|
||||
(eval . (put 'replace 'scheme-indent-function 1))
|
||||
(eval . (put 'add-before 'scheme-indent-function 2))
|
||||
(eval . (put 'add-after 'scheme-indent-function 2))
|
||||
|
||||
(eval . (put 'modify-services 'scheme-indent-function 1))
|
||||
(eval . (put 'with-directory-excursion 'scheme-indent-function 1))
|
||||
(eval . (put 'package 'scheme-indent-function 0))
|
||||
|
@ -68,6 +75,7 @@
|
|||
|
||||
(eval . (put 'call-with-container 'scheme-indent-function 1))
|
||||
(eval . (put 'container-excursion 'scheme-indent-function 1))
|
||||
(eval . (put 'eventually 'scheme-indent-function 1))
|
||||
|
||||
;; Recognize '~', '+', and '$', as used for gexps, as quotation symbols.
|
||||
;; This notably allows '(' in Paredit to not insert a space when the
|
||||
|
|
|
@ -6,6 +6,8 @@
|
|||
*.tar.xz
|
||||
*.tmp
|
||||
*~
|
||||
.#*
|
||||
\#*\#
|
||||
,*
|
||||
/ABOUT-NLS
|
||||
/INSTALL
|
||||
|
@ -31,6 +33,7 @@
|
|||
/doc/guix.cps
|
||||
/doc/guix.fn
|
||||
/doc/guix.fns
|
||||
/doc/guix.html
|
||||
/doc/guix.info
|
||||
/doc/guix.info-[0-9]
|
||||
/doc/guix.ky
|
||||
|
@ -125,3 +128,4 @@ tmp
|
|||
/doc/os-config-lightweight-desktop.texi
|
||||
/nix/scripts/download
|
||||
/etc/indent-code.el
|
||||
/.version
|
||||
|
|
15
.mailmap
15
.mailmap
|
@ -1,6 +1,7 @@
|
|||
# This list is used to avoid multiple name/email instances of the same
|
||||
# contributors reported by "git log" and "git shortlog" commands.
|
||||
|
||||
Adriano Peluso <catonano@gmail.com>
|
||||
Al McElrath <hello@yrns.org> <hello@atonesir.com>
|
||||
Alex Sassmannshausen <alex@pompo.co> <alex.sassmannshausen@gmail.com>
|
||||
Alexander I. Grafov <grafov@gmail.com>
|
||||
|
@ -39,13 +40,15 @@ Marek Benc <dusxmt@gmx.com> <merkur32@gmail.com>
|
|||
Marius Bakke <mbakke@fastmail.com> <m.bakke@warwick.ac.uk>
|
||||
Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org>
|
||||
Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org>
|
||||
Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
|
||||
ng0 <contact.ng0@cryptolab.net>
|
||||
ng0 <contact.ng0@cryptolab.net> <ng0@we.make.ritual.n0.is>
|
||||
ng0 <contact.ng0@cryptolab.net> <ngillmann@runbox.com>
|
||||
ng0 <contact.ng0@cryptolab.net> <niasterisk@grrlz.net>
|
||||
ng0 <contact.ng0@cryptolab.net> <ng@niasterisk.space>
|
||||
ng0 <contact.ng0@cryptolab.net> <ng0@libertad.pw>
|
||||
ng0 <ng0@no-reply.pragmatique.xyz>
|
||||
ng0 <ng0@no-reply.pragmatique.xyz> <contact.ng0@cryptolab.net>
|
||||
ng0 <ng0@no-reply.pragmatique.xyz> <ng0@we.make.ritual.n0.is>
|
||||
ng0 <ng0@no-reply.pragmatique.xyz> <ngillmann@runbox.com>
|
||||
ng0 <ng0@no-reply.pragmatique.xyz> <niasterisk@grrlz.net>
|
||||
ng0 <ng0@no-reply.pragmatique.xyz> <ng@niasterisk.space>
|
||||
ng0 <ng0@no-reply.pragmatique.xyz> <ng0@libertad.pw>
|
||||
Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public01@thebird.nl>
|
||||
Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@thebird.nl>
|
||||
Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@email>
|
||||
|
|
206
Makefile.am
206
Makefile.am
|
@ -4,6 +4,8 @@
|
|||
# Copyright © 2015, 2017 Alex Kost <alezost@gmail.com>
|
||||
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
||||
# Copyright © 2016, 2017 Mark H Weaver <mhw@netris.org>
|
||||
# Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
# Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
#
|
||||
# This file is part of GNU Guix.
|
||||
#
|
||||
|
@ -27,6 +29,10 @@ nodist_noinst_SCRIPTS = \
|
|||
pre-inst-env \
|
||||
test-env
|
||||
|
||||
# Modules that are not compiled but are installed nonetheless, such as
|
||||
# build-side modules with unusual dependencies.
|
||||
MODULES_NOT_COMPILED =
|
||||
|
||||
include gnu/local.mk
|
||||
|
||||
MODULES = \
|
||||
|
@ -45,6 +51,7 @@ MODULES = \
|
|||
guix/sets.scm \
|
||||
guix/modules.scm \
|
||||
guix/download.scm \
|
||||
guix/discovery.scm \
|
||||
guix/git-download.scm \
|
||||
guix/hg-download.scm \
|
||||
guix/monads.scm \
|
||||
|
@ -59,7 +66,9 @@ MODULES = \
|
|||
guix/upstream.scm \
|
||||
guix/licenses.scm \
|
||||
guix/graph.scm \
|
||||
guix/cache.scm \
|
||||
guix/cve.scm \
|
||||
guix/workers.scm \
|
||||
guix/zlib.scm \
|
||||
guix/build-system.scm \
|
||||
guix/build-system/ant.scm \
|
||||
|
@ -116,6 +125,7 @@ MODULES = \
|
|||
guix/build/syscalls.scm \
|
||||
guix/build/gremlin.scm \
|
||||
guix/build/emacs-utils.scm \
|
||||
guix/build/java-utils.scm \
|
||||
guix/build/lisp-utils.scm \
|
||||
guix/build/graft.scm \
|
||||
guix/build/bournish.scm \
|
||||
|
@ -151,7 +161,6 @@ MODULES = \
|
|||
guix/scripts/import/gnu.scm \
|
||||
guix/scripts/import/nix.scm \
|
||||
guix/scripts/import/hackage.scm \
|
||||
guix/scripts/import/stackage.scm \
|
||||
guix/scripts/import/elpa.scm \
|
||||
guix/scripts/environment.scm \
|
||||
guix/scripts/publish.scm \
|
||||
|
@ -176,7 +185,8 @@ MODULES += \
|
|||
guix/import/stackage.scm \
|
||||
guix/scripts/import/crate.scm \
|
||||
guix/scripts/import/gem.scm \
|
||||
guix/scripts/import/pypi.scm
|
||||
guix/scripts/import/pypi.scm \
|
||||
guix/scripts/import/stackage.scm
|
||||
|
||||
endif
|
||||
|
||||
|
@ -184,7 +194,8 @@ if HAVE_GUILE_SSH
|
|||
|
||||
MODULES += \
|
||||
guix/ssh.scm \
|
||||
guix/scripts/copy.scm
|
||||
guix/scripts/copy.scm \
|
||||
guix/store/ssh.scm
|
||||
|
||||
endif HAVE_GUILE_SSH
|
||||
|
||||
|
@ -201,8 +212,8 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
|
|||
# Auxiliary files for packages.
|
||||
AUX_FILES = \
|
||||
gnu/packages/aux-files/emacs/guix-emacs.el \
|
||||
gnu/packages/aux-files/linux-libre/4.10-i686.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.10-x86_64.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.11-i686.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.11-x86_64.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.9-i686.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.9-x86_64.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.4-i686.conf \
|
||||
|
@ -214,12 +225,13 @@ AUX_FILES = \
|
|||
EXAMPLES = \
|
||||
gnu/system/examples/bare-bones.tmpl \
|
||||
gnu/system/examples/desktop.tmpl \
|
||||
gnu/system/examples/lightweight-desktop.tmpl
|
||||
gnu/system/examples/lightweight-desktop.tmpl \
|
||||
gnu/system/examples/vm-image.tmpl
|
||||
|
||||
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
|
||||
|
||||
nobase_dist_guilemodule_DATA = \
|
||||
$(MODULES) $(AUX_FILES) $(EXAMPLES) \
|
||||
nobase_dist_guilemodule_DATA = \
|
||||
$(MODULES) $(MODULES_NOT_COMPILED) $(AUX_FILES) $(EXAMPLES) \
|
||||
$(MISC_DISTRO_FILES)
|
||||
nobase_nodist_guilemodule_DATA = guix/config.scm
|
||||
nobase_nodist_guileobject_DATA = $(GOBJECTS)
|
||||
|
@ -271,6 +283,7 @@ SCM_TESTS = \
|
|||
tests/records.scm \
|
||||
tests/upstream.scm \
|
||||
tests/combinators.scm \
|
||||
tests/discovery.scm \
|
||||
tests/utils.scm \
|
||||
tests/build-utils.scm \
|
||||
tests/packages.scm \
|
||||
|
@ -294,7 +307,9 @@ SCM_TESTS = \
|
|||
tests/size.scm \
|
||||
tests/graph.scm \
|
||||
tests/challenge.scm \
|
||||
tests/cache.scm \
|
||||
tests/cve.scm \
|
||||
tests/workers.scm \
|
||||
tests/zlib.scm \
|
||||
tests/file-systems.scm \
|
||||
tests/system.scm \
|
||||
|
@ -373,14 +388,16 @@ check-local:
|
|||
|
||||
endif !CAN_RUN_TESTS
|
||||
|
||||
check-system: $(GOBJECTS)
|
||||
check-system: $(GOBJECTS) $(BOOTSTRAP_GUILE_TARBALLS)
|
||||
$(AM_V_at)$(top_builddir)/pre-inst-env \
|
||||
$(GUILE) --no-auto-compile \
|
||||
-e '(@@ (run-system-tests) run-system-tests)' \
|
||||
$(top_srcdir)/build-aux/run-system-tests.scm
|
||||
|
||||
# Public key used to sign substitutes from hydra.gnu.org.
|
||||
dist_pkgdata_DATA = hydra.gnu.org.pub
|
||||
# Public key used to sign substitutes from hydra.gnu.org & co.
|
||||
dist_pkgdata_DATA = \
|
||||
hydra.gnu.org.pub \
|
||||
bayfront.guixsd.org.pub
|
||||
|
||||
# Bash completion file.
|
||||
dist_bashcompletion_DATA = etc/completion/bash/guix
|
||||
|
@ -398,13 +415,14 @@ EXTRA_DIST = \
|
|||
build-aux/compile-all.scm \
|
||||
build-aux/hydra/evaluate.scm \
|
||||
build-aux/hydra/gnu-system.scm \
|
||||
build-aux/hydra/demo-os.scm \
|
||||
build-aux/hydra/guix.scm \
|
||||
build-aux/check-available-binaries.scm \
|
||||
build-aux/check-final-inputs-self-contained.scm \
|
||||
build-aux/download.scm \
|
||||
build-aux/generate-authors.scm \
|
||||
build-aux/test-driver.scm \
|
||||
build-aux/update-guix-package.scm \
|
||||
build-aux/update-NEWS.scm \
|
||||
build-aux/run-system-tests.scm \
|
||||
d3.v3.js \
|
||||
graph.js \
|
||||
|
@ -481,32 +499,42 @@ endif BUILD_DAEMON
|
|||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
# Pass an explicit '--localstatedir' so that configure does not error out if
|
||||
# it finds an existing installation with a different localstatedir.
|
||||
# it finds an existing installation with a different localstatedir. Inherit
|
||||
# 'ac_cv_guix_test_root' so that "make check" in $(distdir) does not have to
|
||||
# repopulate the whole store, and to make sure $(GUIX_TEST_ROOT) is short
|
||||
# enough for shebangs.
|
||||
AM_DISTCHECK_CONFIGURE_FLAGS = \
|
||||
--localstatedir="$$dc_install_base/var" \
|
||||
--with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)" \
|
||||
--with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)" \
|
||||
--with-nix-prefix="$(NIX_PREFIX)" \
|
||||
--enable-daemon
|
||||
--enable-daemon \
|
||||
ac_cv_guix_test_root="$(GUIX_TEST_ROOT)"
|
||||
|
||||
# The self-contained tarball.
|
||||
# The self-contained tarball. Add 'glibc-utf8-locales' along with glibc just
|
||||
# so 'etc/profile' defines 'GUIX_LOCPATH' pointing to a valid set of locales.
|
||||
guix-binary.%.tar.xz:
|
||||
$(AM_V_GEN)GUIX_PACKAGE_PATH= \
|
||||
tarball=`$(top_builddir)/pre-inst-env guix pack -C xz \
|
||||
-s "$*" --localstatedir guix` ; \
|
||||
$(AM_V_GEN)GUIX_PACKAGE_PATH= \
|
||||
tarball=`$(top_builddir)/pre-inst-env guix pack -K -C xz \
|
||||
-s "$*" --localstatedir guix glibc-utf8-locales \
|
||||
-e '(@@ (gnu packages commencement) glibc-final)'` ; \
|
||||
cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@"
|
||||
|
||||
|
||||
dist-hook: sync-descriptions gen-ChangeLog gen-AUTHORS
|
||||
dist-hook: $(distdir)/ChangeLog gen-AUTHORS gen-tarball-version
|
||||
dist-hook: assert-no-store-file-names
|
||||
|
||||
distcheck-hook: assert-binaries-available assert-final-inputs-self-contained
|
||||
|
||||
sync-descriptions:
|
||||
$(AM_V_at)GUIX_PACKAGE_PATH= \
|
||||
$(top_builddir)/pre-inst-env guix lint --checkers=gnu-description
|
||||
EXTRA_DIST += $(top_srcdir)/.version
|
||||
BUILT_SOURCES += $(top_srcdir)/.version
|
||||
$(top_srcdir)/.version:
|
||||
echo $(VERSION) > "$@-t" && mv "$@-t" "$@"
|
||||
|
||||
gen-ChangeLog:
|
||||
gen-tarball-version:
|
||||
echo $(VERSION) > "$(distdir)/.tarball-version"
|
||||
|
||||
gen-ChangeLog $(distdir)/ChangeLog:
|
||||
$(AM_V_GEN)if test -d .git; then \
|
||||
$(top_srcdir)/build-aux/gitlog-to-changelog \
|
||||
> $(distdir)/cl-t; \
|
||||
|
@ -522,8 +550,134 @@ gen-AUTHORS:
|
|||
"$(top_srcdir)" "$(distdir)/AUTHORS"; \
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# Release management.
|
||||
#
|
||||
|
||||
releasedir = release-$(PACKAGE_VERSION)
|
||||
|
||||
PACKAGE_FULL_TARNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
|
||||
|
||||
# List of source tarballs produced. This must be kept in sync with the
|
||||
# 'dist-' options of 'AM_INIT_AUTOMAKE' in 'configure.ac'.
|
||||
SOURCE_TARBALLS = \
|
||||
$(foreach ext,tar.gz,$(PACKAGE_FULL_TARNAME).$(ext))
|
||||
|
||||
# Systems supported by Guix.
|
||||
SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux
|
||||
|
||||
# Guix binary tarballs.
|
||||
BINARY_TARBALLS = \
|
||||
$(foreach system,$(SUPPORTED_SYSTEMS),guix-binary.$(system).tar.xz)
|
||||
|
||||
# Systems supported by GuixSD.
|
||||
GUIXSD_SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux
|
||||
|
||||
# Systems for which we build GuixSD VMs.
|
||||
GUIXSD_VM_SYSTEMS ?= x86_64-linux
|
||||
|
||||
# Prefix of the GuixSD installation image file name.
|
||||
GUIXSD_IMAGE_BASE = guixsd-usb-install-$(PACKAGE_VERSION)
|
||||
|
||||
# Prefix of the GuixSD VM image file name.
|
||||
GUIXSD_VM_IMAGE_BASE = guixsd-vm-image-$(PACKAGE_VERSION)
|
||||
|
||||
# Size of the installation image (for x86_64 typically).
|
||||
GUIXSD_INSTALLATION_IMAGE_SIZE ?= 950MiB
|
||||
|
||||
# Size of the VM image (for x86_64 typically).
|
||||
GUIXSD_VM_IMAGE_SIZE ?= 2GiB
|
||||
|
||||
# The release process works in several phases:
|
||||
#
|
||||
# 0. We assume the developer created a 'vX.Y' tag.
|
||||
# 1. Build the source tarball.
|
||||
# 2. Update the 'guix' package so that it corresponds to the 'vX.Y' tag.
|
||||
# 3. Build the binary tarballs for that 'guix' package.
|
||||
# 4. Update the 'guix' package again.
|
||||
# 5. Build the GuixSD installation images. The images will run 'guix'
|
||||
# corresponding to 'vX.Y' + 1 commit, and they will install 'vX.Y'.
|
||||
#
|
||||
# This 'release' target takes care of everything and copies the resulting
|
||||
# files to $(releasedir).
|
||||
#
|
||||
# XXX: Depend on 'dist' rather than 'distcheck' to work around the Gettext
|
||||
# issue described at <https://savannah.gnu.org/bugs/index.php?51027>.
|
||||
release: dist
|
||||
cd po; git checkout .
|
||||
@if ! git diff-index --quiet HEAD; then \
|
||||
echo "There are uncommitted changes; stopping." >&2 ; \
|
||||
exit 1 ; \
|
||||
fi
|
||||
$(MKDIR_P) "$(releasedir)"
|
||||
rm -f "$(releasedir)"/*
|
||||
mv $(SOURCE_TARBALLS) "$(releasedir)"
|
||||
$(top_builddir)/pre-inst-env "$(GUILE)" \
|
||||
$(top_srcdir)/build-aux/update-guix-package.scm \
|
||||
"`git rev-parse HEAD`" "$(PACKAGE_VERSION)"
|
||||
git add $(top_srcdir)/gnu/packages/package-management.scm
|
||||
git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)."
|
||||
rm -f $(BINARY_TARBALLS)
|
||||
$(MAKE) $(BINARY_TARBALLS)
|
||||
for system in $(SUPPORTED_SYSTEMS) ; do \
|
||||
mv "guix-binary.$$system.tar.xz" \
|
||||
"$(releasedir)/guix-binary-$(PACKAGE_VERSION).$$system.tar.xz" ; \
|
||||
done
|
||||
$(top_builddir)/pre-inst-env "$(GUILE)" \
|
||||
$(top_srcdir)/build-aux/update-guix-package.scm \
|
||||
"`git rev-parse HEAD`"
|
||||
git add $(top_srcdir)/gnu/packages/package-management.scm
|
||||
git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`."
|
||||
for system in $(GUIXSD_SUPPORTED_SYSTEMS) ; do \
|
||||
image=`$(top_builddir)/pre-inst-env \
|
||||
guix system disk-image \
|
||||
--system=$$system \
|
||||
--image-size=$(GUIXSD_INSTALLATION_IMAGE_SIZE) \
|
||||
gnu/system/install.scm` ; \
|
||||
if [ ! -f "$$image" ] ; then \
|
||||
echo "failed to produced GuixSD installation image for $$system" >&2 ; \
|
||||
exit 1 ; \
|
||||
fi ; \
|
||||
xz < "$$image" > "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.xz.tmp" ; \
|
||||
mv "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.xz.tmp" \
|
||||
"$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.xz" ; \
|
||||
done
|
||||
for system in $(GUIXSD_VM_SYSTEMS) ; do \
|
||||
image=`$(top_builddir)/pre-inst-env \
|
||||
guix system vm-image \
|
||||
--system=$$system \
|
||||
--image-size=$(GUIXSD_VM_IMAGE_SIZE) \
|
||||
gnu/system/examples/vm-image.tmpl` ; \
|
||||
if [ ! -f "$$image" ] ; then \
|
||||
echo "failed to produced GuixSD VM image for $$system" >&2 ; \
|
||||
exit 1 ; \
|
||||
fi ; \
|
||||
xz < "$$image" > "$(releasedir)/$(GUIXSD_VM_IMAGE_BASE).$$system.xz.tmp" ; \
|
||||
mv "$(releasedir)/$(GUIXSD_VM_IMAGE_BASE).$$system.xz.tmp" \
|
||||
"$(releasedir)/$(GUIXSD_VM_IMAGE_BASE).$$system.xz" ; \
|
||||
done
|
||||
@echo
|
||||
@echo "Congratulations! All the release files are now in $(releasedir)."
|
||||
@echo
|
||||
|
||||
update-guix-package:
|
||||
git rev-parse HEAD
|
||||
$(top_builddir)/pre-inst-env "$(GUILE)" \
|
||||
$(top_srcdir)/build-aux/update-guix-package.scm \
|
||||
"`git rev-parse HEAD`"
|
||||
|
||||
# Location of a checkout of <git://git.savannah.gnu.org/guix/maintenance.git>.
|
||||
# Package data from this checkout is used by 'update-NEWS.scm'.
|
||||
GUIX_MAINTENANCE_DIRECTORY ?= $(top_srcdir)/../guix-maintenance
|
||||
|
||||
update-NEWS: $(GOBJECTS)
|
||||
$(top_builddir)/pre-inst-env "$(GUILE)" \
|
||||
$(top_srcdir)/build-aux/update-NEWS.scm \
|
||||
$(top_srcdir)/NEWS "$(GUIX_MAINTENANCE_DIRECTORY)/data"
|
||||
|
||||
# Make sure we're not shipping a file that embeds a local /gnu/store file name.
|
||||
assert-no-store-file-names:
|
||||
assert-no-store-file-names: $(distdir)/ChangeLog
|
||||
$(AM_V_at)if grep -r --exclude=*.texi --exclude=*.info \
|
||||
--exclude=*.info-[0-9] --exclude=*.dot \
|
||||
--exclude=*.eps --exclude-dir=bootstrap \
|
||||
|
@ -553,9 +707,11 @@ hydra-jobs.scm: $(GOBJECTS)
|
|||
"$(top_srcdir)/build-aux/hydra/gnu-system.scm" > "$@.tmp"
|
||||
$(AM_V_at)mv "$@.tmp" "$@"
|
||||
|
||||
.PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go make-go
|
||||
.PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version
|
||||
.PHONY: assert-no-store-file-names assert-binaries-available
|
||||
.PHONY: assert-final-inputs-self-contained
|
||||
.PHONY: clean-go make-go
|
||||
.PHONY: update-guix-package update-NEWS release
|
||||
|
||||
## -------------- ##
|
||||
## Silent rules. ##
|
||||
|
|
611
NEWS
611
NEWS
|
@ -2,7 +2,7 @@
|
|||
#+TITLE: Guix NEWS – history of user-visible changes
|
||||
#+STARTUP: content hidestars
|
||||
|
||||
Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
|
||||
Copying and distribution of this file, with or without modification,
|
||||
are permitted in any medium without royalty provided the copyright
|
||||
|
@ -10,6 +10,615 @@ Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
|||
|
||||
Please send Guix bug reports to bug-guix@gnu.org.
|
||||
|
||||
* Changes in 0.13.0 (since 0.12.0)
|
||||
|
||||
** Package management
|
||||
|
||||
*** Guix can now be used on aarch64 GNU/Linux systems
|
||||
*** New ‘guix pack’ command to create bundles
|
||||
*** New ‘guix copy’ command to copy store items over SSH
|
||||
*** New ‘--cache’ option for ‘guix publish’
|
||||
*** $GUIX_DAEMON_SOCKET can specify remote daemons
|
||||
*** Guix can now run on Guile 2.2, providing better performance
|
||||
*** Emacs interface moved to separate Emacs-Guix package
|
||||
*** New ‘--root’ option for ‘guix environment’
|
||||
*** ‘guix pull’ now connects to git.savannah.gnu.org over HTTPS
|
||||
*** New cross-compilation targets: aarch64-linux-gnu, powerpc-linux-gnu
|
||||
*** Packages can specify “single-entry search paths” (e.g., ‘GIT_EXEC_PATH’)
|
||||
*** ‘guix import’ and ‘guix refresh’ now support Stackage
|
||||
*** Support for the deprecated “PKG-VERSION” syntax has been removed
|
||||
*** New Cypher backend for ‘guix graph’
|
||||
*** GnuTLS (Guile bindings) is now required
|
||||
*** Guix now issues a warning when it detects that Guix has not been upgraded in a while
|
||||
|
||||
** Distribution
|
||||
|
||||
*** The GuixSD installation image supports (U)EFI systems
|
||||
*** GuixSD supports Btrfs (<http://bugs.gnu.org/19280>)
|
||||
*** Some system services are now run in separate namespaces (“containers”)
|
||||
*** The LXDE desktop environment is now available
|
||||
*** ‘grub-configuration’ can specify settings for the user interface
|
||||
*** Service types can now specify a default value for services
|
||||
*** Create the /var/log/wtmp and /var/log/utmpx databases
|
||||
*** A raw initial RAM disk can be created to support systems with custom kernel configurations
|
||||
*** ‘static-networking’ service can now be extended
|
||||
*** Configuration of ‘nginx-service-type’ has been greatly improved
|
||||
*** New ‘gnu-build-system’ phase to always reset gzip timestamps
|
||||
*** New services
|
||||
|
||||
exim, mail-aliases, inetd, agetty, openvswitch, special-files, redis,
|
||||
thermald
|
||||
|
||||
*** 840 new packages
|
||||
|
||||
0ad, 0ad-data, adb, alpine, alsa-plugins, angband, antlr2, antlr3,
|
||||
appstream-glib, aris, aspell-dict-pt-br, asunder, balsa, bam, beep,
|
||||
binutils-vc4, blind, blists, btrfs-progs-static, camlzip, cargo, catdoc,
|
||||
catimg, ccd2cue, cdogs-sdl, cdrtools, ceph, checkpolicy, cifs-utils, cmst,
|
||||
colors, compface, compton, cool-retro-term, corrode, crawl, darcs,
|
||||
darktable, dcmtk, deutex, ding-libs, dotherside, dovecot-libsodium-plugin,
|
||||
dovecot-trees, dub, dvd+rw-tools, dvdauthor, dvdstyler, dzen, e3, electrum,
|
||||
emacs-adaptive-wrap, emacs-ag, emacs-aggressive-indent, emacs-alert,
|
||||
emacs-ansi, emacs-calfw, emacs-cdlatex, emacs-commander,
|
||||
emacs-default-encrypt, emacs-diminish, emacs-dream-theme,
|
||||
emacs-evil-commentary, emacs-evil-surround, emacs-exwm, emacs-git-gutter,
|
||||
emacs-git-timemachine, emacs-gntp, emacs-gnuplot, emacs-google-maps,
|
||||
emacs-highlight-sexp, emacs-ht, emacs-htmlize, emacs-idle-highlight,
|
||||
emacs-key-chord, emacs-keyfreq, emacs-linum-relative, emacs-log4e,
|
||||
emacs-memoize, emacs-mew, emacs-monroe, emacs-mu4e-alert, emacs-ox-twbs,
|
||||
emacs-pretty-mode, emacs-strace-mode, emacs-stripe-buffer, emacs-sx,
|
||||
emacs-symon, emacs-transpose-frame, emacs-use-package, emacs-xelb,
|
||||
emacs-xmlgen, emacs-yasnippet, emacspeak, enigma, ert-runner, es,
|
||||
eudev-with-hwdb, f3, fabric, fcitx-configtool, filezilla, fillets-ng,
|
||||
fish-guix, fmt, font-awesome, font-cns11643, font-cns11643-swjz,
|
||||
font-comic-neue, font-go, font-google-material-design-icons,
|
||||
font-google-roboto, font-iosevka, font-linuxlibertine, font-tamzen,
|
||||
font-wqy-microhei, fortify-headers, fprintd, freeciv, freedoom, freegish,
|
||||
freerdp, freetalk, freexl, gcc-vc4, gcompris-qt, geos, ghc-code-page,
|
||||
ghc-hslogger, ghc-json, ghc-language-c, ghc-markdown-unlit, ghc-setlocale,
|
||||
ghc-unexceptionalio, ghc-wave, git-crypt, gl2ps, gnome-autoar,
|
||||
gnome-disk-utility, gnumach, gnushogi, gnustep-make, gpicview, grafx2,
|
||||
graphene, guildhall, guile-8sync, guile-bash, guile-fibers, guile-git,
|
||||
guile-ics, guile-miniadapton, guile-sdl2, guile-sjson,
|
||||
guile-syntax-highlight, guile2.0-commonmark, guile2.0-haunt, guile2.0-json,
|
||||
guile2.0-reader, guile2.0-ssh, guile2.2-gdbm-ffi, guile2.2-gnutls,
|
||||
guile2.2-haunt, guile2.2-lib, guile2.2-reader, guile2.2-ssh, heimdal,
|
||||
hiawatha, hisat2, http-parser, httpfs2, httpstat, hubbub, human, hurd,
|
||||
hyperestraier, idris-bifunctors, idris-lens, idris-lightyear,
|
||||
idris-wl-pprint, intel-gpu-tools, itpp, jacal, java-asm, java-cglib,
|
||||
java-commons-cli, java-commons-codec, java-commons-collections4,
|
||||
java-commons-compress, java-commons-daemon, java-commons-io,
|
||||
java-commons-lang, java-commons-lang3, java-commons-logging-minimal,
|
||||
java-commons-math3, java-commons-net, java-easymock, java-eclipse-ant-core,
|
||||
java-eclipse-compare-core, java-eclipse-core-commands,
|
||||
java-eclipse-core-contenttype, java-eclipse-core-expressions,
|
||||
java-eclipse-core-filesystem, java-eclipse-core-jobs,
|
||||
java-eclipse-core-resources, java-eclipse-core-runtime,
|
||||
java-eclipse-core-variables, java-eclipse-equinox-app,
|
||||
java-eclipse-equinox-common, java-eclipse-equinox-preferences,
|
||||
java-eclipse-equinox-registry, java-eclipse-jdt-core, java-eclipse-osgi,
|
||||
java-eclipse-team-core, java-eclipse-text, java-guava, java-hamcrest-all,
|
||||
java-httpcomponents-httpclient, java-httpcomponents-httpcore,
|
||||
java-httpcomponents-httpcore-ab, java-httpcomponents-httpcore-nio,
|
||||
java-httpcomponents-httpmime, java-icu4j, java-javax-mail, java-jmh,
|
||||
java-jmock, java-jopt-simple, java-jsch, java-jsr305, java-log4j-api,
|
||||
java-mockito, java-objenesis, java-osgi-annotation, java-osgi-core,
|
||||
java-osgi-service-event, java-plexus-interpolation, java-plexus-utils,
|
||||
java-rsyntaxtextarea, java-simple-xml, java-usb4java, joe, kakoune,
|
||||
keybinder, kiki, knot, lchat, le-certs, leafpad, lensfun, leveldb, libbson,
|
||||
libcss, libdom, libfilezilla, libfprint, libgig, libgme,
|
||||
libgnome-games-support, libircclient, libmesode, libmnl, libmp4v2,
|
||||
libmpack, libnftnl, libnsbmp, libnsgif, libnspsl, libnsutils,
|
||||
libparserutils, libpng-apng, libselinux, libsemanage, libsepol, libsmf,
|
||||
libstaroffice, libstrophe, libsvgtiny, libtorrent-rasterbar, liburcu,
|
||||
libusb4java, libutf, libvterm, libwapcaplet, libxls, libzmf, lierolibre,
|
||||
light, lightdm, lightdm-gtk-greeter, linsmith, linuxdcpp,
|
||||
llvm-for-extempore, lmms, loudmouth, lshw, lsyncd, lua-libmpack,
|
||||
lua5.2-bitop, lua5.2-libmpack, lua5.2-lpeg, lugaru, luminance-hdr, lush2,
|
||||
lxde, lxde-common, lxde-icon-theme, lxinput, lxmenu-data, lxpanel,
|
||||
lxsession, maxflow, mbedtls-apache, mcabber, mcomix, mdbtools, megaglest,
|
||||
megaglest-data, menumaker, mes, meson, mia, minizip, mlmmj,
|
||||
multipath-tools, neofetch, neomutt, neovim, neovim-syntastic,
|
||||
netcdf-fortran, niftilib, nim, nnn, no-more-secrets, noice, non-mixer,
|
||||
non-timeline, nsgenbind, nss-pam-ldapd, nyacc, nyx, obconf, obnam,
|
||||
ocaml-alcotest, ocaml-astring, ocaml-base64, ocaml-batteries,
|
||||
ocaml-bin-prot, ocaml-bisect, ocaml-bitstring, ocaml-bos, ocaml-cmdliner,
|
||||
ocaml-cppo, ocaml-csv, ocaml-expect, ocaml-fieldslib, ocaml-fileutils,
|
||||
ocaml-fmt, ocaml-fpath, ocaml-frontc, ocaml-gsl, ocaml-js-build-tools,
|
||||
ocaml-jsonm, ocaml-logs, ocaml-lwt, ocaml-mcl, ocaml-mtime, ocaml-oasis,
|
||||
ocaml-ocurl, ocaml-ounit, ocaml-pcre, ocaml-ppx-assert, ocaml-ppx-bench,
|
||||
ocaml-ppx-compare, ocaml-ppx-core, ocaml-ppx-deriving, ocaml-ppx-driver,
|
||||
ocaml-ppx-enumerate, ocaml-ppx-here, ocaml-ppx-inline-test, ocaml-ppx-let,
|
||||
ocaml-ppx-optcomp, ocaml-ppx-sexp-conv, ocaml-ppx-tools,
|
||||
ocaml-ppx-type-conv, ocaml-ppx-typerep-conv, ocaml-ppx-variants-conv,
|
||||
ocaml-qcheck, ocaml-qtest, ocaml-react, ocaml-result, ocaml-rresult,
|
||||
ocaml-sexplib, ocaml-sqlite3, ocaml-ssl, ocaml-stringext, ocaml-topkg,
|
||||
ocaml-typerep, ocaml-uchar, ocaml-ulex, ocaml-uutf, ocaml-variantslib,
|
||||
ocaml-xmlm, ocaml-zarith, ocaml4.01-batteries, ocaml4.01-bisect,
|
||||
ocaml4.01-camlzip, ocaml4.01-csv, ocaml4.01-findlib, ocaml4.01-gsl,
|
||||
ocaml4.01-mcl, ocaml4.01-ounit, ocaml4.01-qtest, ocaml4.01-sqlite3,
|
||||
ocaml4.01-xmlm, ocamlify, ocamlmod, omake, opencascade-oce, openspin,
|
||||
openvswitch, orca, ovmf, pcc, pdfgrep, perl-any-moose, perl-anyevent,
|
||||
perl-anyevent-i3, perl-async-interrupt, perl-canary-stability,
|
||||
perl-cddb-get, perl-crypt-rc4, perl-cwd-guard, perl-devel-checkcompiler,
|
||||
perl-ev, perl-extutils-depends, perl-extutils-pkgconfig, perl-file-pushd,
|
||||
perl-module-build-xsutil, perl-mouse, perl-mousex-nativetraits,
|
||||
perl-ole-storage-lite, perl-parallel-forkmanager, perl-switch,
|
||||
perl-test-needs, perl-test-number-delta, perl-x11-xcb, perl-xml-descent,
|
||||
perl-xml-tokeparser, perl-xs-object-magic, phonon-backend-gstreamer,
|
||||
pngcrunch, policycoreutils, polkit-gnome, ponymix, pootle, postorius,
|
||||
pplacer, prboom-plus, profanity, proj.4, proot, proot-static,
|
||||
propeller-development-suite, propeller-gcc, propeller-load,
|
||||
propeller-toolchain, proplib, prout, python-astroid, python-autopep8,
|
||||
python-colorspacious, python-configparser, python-cram, python-cssmin,
|
||||
python-cssutils, python-cycler, python-ddt, python-defusedxml,
|
||||
python-diff-match-patch, python-dirsync, python-dj-database-url,
|
||||
python-django-allauth, python-django-appconf, python-django-assets,
|
||||
python-django-bulk-update, python-django-contact-form,
|
||||
python-django-contrib-comments, python-django-gravatar2,
|
||||
python-django-jsonfield, python-django-mailman3, python-django-overextends,
|
||||
python-django-redis, python-django-rq, python-django-sortedm2m,
|
||||
python-django-statici18n, python-dulwich, python-elasticsearch,
|
||||
python-eventlet, python-factory-boy, python-faker, python-fakeredis,
|
||||
python-fastimport, python-flake8-polyfill, python-flask-htmlmin,
|
||||
python-flask-login, python-flask-multistatic, python-flask-oidc,
|
||||
python-flask-wtf, python-fudge, python-geventhttpclient, python-gpg,
|
||||
python-hdf4, python-hiredis, python-htmlmin, python-httpbin, python-ipy,
|
||||
python-isort, python-kitchen, python-levenshtein, python-lz4, python-lzo,
|
||||
python-mando, python-mando, python-matplotlib-documentation, python-mpmath,
|
||||
python-munch, python-mwclient, python-mysqlclient, python-netcdf4,
|
||||
python-nosexcover, python-numpy-documentation, python-oauth2client,
|
||||
python-openid, python-openid-cla, python-openid-teams,
|
||||
python-paramunittest, python-pbkdf2, python-poppler-qt5, python-pyatspi,
|
||||
python-pycosat, python-pygit2, python-pykka, python-pylint,
|
||||
python-pyodbc-c, python-pypeg2, python-pytest-catchlog,
|
||||
python-pytest-httpbin, python-pytest-warnings, python-qrcode, python-reno,
|
||||
python-rst2ansi, python-scandir, python-sepolgen, python-setools,
|
||||
python-sge-pygame, python-snowballstemmer, python-sockjs-tornado,
|
||||
python-sphinx-alabaster-theme, python-sphinx-cloud-sptheme,
|
||||
python-sphinx-me, python-straight-plugin, python-tmx,
|
||||
python-translate-toolkit, python-trollius-redis, python-utils,
|
||||
python-webassets, python-xdo, python2-astroid, python2-autopep8,
|
||||
python2-backports-functools-lru-cache,
|
||||
python2-backports-shutil-get-terminal-size, python2-cheetah,
|
||||
python2-cliapp, python2-colorspacious, python2-configparser,
|
||||
python2-coverage-test-runner, python2-cram, python2-cssmin, python2-cycler,
|
||||
python2-ddt, python2-defusedxml, python2-diff-match-patch, python2-dirsync,
|
||||
python2-dj-database-url, python2-django-allauth, python2-django-appconf,
|
||||
python2-django-assets, python2-django-bulk-update,
|
||||
python2-django-contact-form, python2-django-contrib-comments,
|
||||
python2-django-gravatar2, python2-django-jsonfield,
|
||||
python2-django-mailman3, python2-django-overextends, python2-django-redis,
|
||||
python2-django-rq, python2-django-sortedm2m, python2-django-statici18n,
|
||||
python2-dulwich, python2-elasticsearch, python2-eventlet,
|
||||
python2-factory-boy, python2-faker, python2-fakeredis, python2-fastimport,
|
||||
python2-flake8-polyfill, python2-flask-htmlmin, python2-flask-login,
|
||||
python2-flask-multistatic, python2-flask-wtf, python2-fudge,
|
||||
python2-geventhttpclient, python2-gpg, python2-hdf4, python2-hiredis,
|
||||
python2-htmlmin, python2-httpbin, python2-isort, python2-kitchen,
|
||||
python2-larch, python2-levenshtein, python2-lz4, python2-lzo,
|
||||
python2-mando, python2-matplotlib-documentation, python2-mpmath,
|
||||
python2-munch, python2-mwclient, python2-mysqlclient, python2-netcdf4,
|
||||
python2-nosexcover, python2-numpy-documentation, python2-openid,
|
||||
python2-openid-cla, python2-openid-teams, python2-paramunittest,
|
||||
python2-pbkdf2, python2-pycosat, python2-pygame, python2-pygit2,
|
||||
python2-pykka, python2-pylint, python2-pyodbc-c, python2-pytest-catchlog,
|
||||
python2-pytest-httpbin, python2-pytest-warnings, python2-qrcode,
|
||||
python2-reno, python2-ruamel.ordereddict, python2-scandir,
|
||||
python2-sge-pygame, python2-slowaes, python2-snowballstemmer,
|
||||
python2-sockjs-tornado, python2-sphinx-alabaster-theme,
|
||||
python2-sphinx-cloud-sptheme, python2-sphinx-me, python2-stemming,
|
||||
python2-straight-plugin, python2-subprocess32, python2-tmx,
|
||||
python2-tracing, python2-translate-toolkit, python2-trollius-redis,
|
||||
python2-ttystatus, python2-utils, pzstd, qdbm, qjackctl, qtcanvas3d,
|
||||
qtcharts, qtdatavis3d, qtdeclarative-render2d, qtgamepad, qtpurchasing,
|
||||
qtscxml, qtserialbus, qutebrowser, r-affy, r-affyio, r-ape, r-base64,
|
||||
r-beeswarm, r-bookdown, r-boot, r-bsgenome-hsapiens-1000genomes-hs37d5,
|
||||
r-cairo, r-car, r-caret, r-centipede, r-chipseq, r-class, r-commonmark,
|
||||
r-compquadform, r-copyhelper, r-copywriter, r-cowplot, r-delayedarray,
|
||||
r-deoptimr, r-desc, r-diptest, r-fastica, r-fivethirtyeight, r-flexmix,
|
||||
r-fnn, r-fpc, r-genomeinfodbdata, r-ggbeeswarm, r-ggthemes, r-lars, r-lme4,
|
||||
r-maldiquant, r-mass, r-matrixmodels, r-mclust, r-minimal, r-minqa,
|
||||
r-mixtools, r-mnormt, r-modelmetrics, r-modeltools, r-msnbase, r-msnid,
|
||||
r-mzid, r-mzr, r-nlme, r-nloptr, r-numderiv, r-pbapply, r-pbkrtest,
|
||||
r-pcamethods, r-plogr, r-prabclus, r-protgenerics, r-quantreg,
|
||||
r-randomforest, r-ranger, r-rann, r-raremetals2, r-rcppeigen,
|
||||
r-rcppprogress, r-rhdf5, r-robustbase, r-rprojroot, r-seqminer, r-seurat,
|
||||
r-sn, r-sourcetools, r-spatial, r-statmod, r-sva, r-tclust, r-trimcluster,
|
||||
r-tsne, r-txdb-mmusculus-ucsc-mm10-knowngene, r-tximport, r-vgam, r-vipor,
|
||||
r-vsn, rdma-core, re2c, reducelcs, ribodiff, ripit, rocksdb, roffit,
|
||||
rsnapshot, ruby-mail, sambamba, sbm, scheme48-rx, scm, scrypt, scsh,
|
||||
seabios, secilc, sedsed, shellcheck, simh, skroll, slib, sonic,
|
||||
speedtest-cli, speexdsp, spin2cpp, spinsim, spoon, sssd, stringtemplate3,
|
||||
stringtemplate4, stunnel, swaks, syslinux, sysstat, tailon, talloc-static,
|
||||
tango-icon-theme, taxtastic, tclx, teeworlds, tftp-hpa, thermald,
|
||||
tidy-html, tipp10, tlp, tokyocabinet, tracker, tremc, twm, unibilium,
|
||||
unrar, vim-airline, vim-airline-themes, vim-context-filetype, vim-luna,
|
||||
vim-neocomplete, vim-neosnippet, vim-neosnippet-snippets, vim-scheme,
|
||||
vim-syntastic, vinagre, volk, wificurse, wimlib, wwwoffle, wxsvg, xbattmon,
|
||||
xcalc, xdot, xerces-c, xfce4-notifyd, xinetd, xmag, xmessage, xshogi,
|
||||
you-get, youtube-dl-gui, zile-on-guile, zpaq, zstd
|
||||
|
||||
*** 1220 package updates
|
||||
|
||||
abbaye@2.0.1, abcde@2.8.1, abiword@3.0.2, acct@6.6.3, acme-client@0.1.16,
|
||||
acpid@2.0.28, adwaita-icon-theme@3.24.0, aide@0.16, aisleriot@3.22.1,
|
||||
allegro@5.0.11, allegro@5.2.0, alsa-lib@1.1.3, alsa-utils@1.1.3,
|
||||
ams-lv2@1.2.1, amsynth@1.7.1, ansible@2.3.0.0, ant@1.9.9, apl@1.7,
|
||||
aqbanking@5.6.12, arb@2.10.0, arc-icon-theme@20161122, arc-theme@20170302,
|
||||
ardour@5.8, aria-maestosa@1.4.13, aria2@1.31.0,
|
||||
arm-none-eabi-nano-toolchain@6.3.0, arm-none-eabi-toolchain@6.3.0,
|
||||
armadillo@7.800.2, aseprite@1.1.7, assword@0.10, asymptote@2.41,
|
||||
at-spi2-atk@2.22.0, at-spi2-core@2.22.0, atk@2.22.0, attica@5.34.0,
|
||||
audacity@2.1.3, augeas@1.8.0, autoconf-archive@2017.03.21, autoconf@2.69,
|
||||
awesome@4.0, awscli@1.11.63, baloo@5.34.0, bamtools@2.4.1, baobab@3.24.0,
|
||||
bash-completion@2.5, bash-minimal@4.4.12, bash-static@4.4.12, bash@4.4.12,
|
||||
bc@1.07.1, bedtools@2.26.0, beets@1.4.3, bind@9.11.1, bioruby@1.5.1,
|
||||
bison@3.0.4, bitcoin-core@0.14.1, bitlbee@3.5.1, bluez-qt@5.34.0,
|
||||
bluez@5.44, boost@1.63.0, borg@1.0.10, breeze-icons@5.34.0,
|
||||
bs1770gain@0.4.12, btrfs-progs@4.10.2, bullet@2.86.1, bundler@1.14.5,
|
||||
busybox@1.26.0, cairo-xcb@1.14.8, cairo@1.14.8, cairomm@1.12.2,
|
||||
calibre@2.76.0, capnproto@0.6.0, cbatticon@1.6.5, ccache@3.3.4,
|
||||
ccid@1.4.26, cd-hit@4.6.6, certbot@0.14.0, cgit@1.1, chicken@4.12.0,
|
||||
cl-stumpwm@1.0.0, clang-runtime@3.9.1, clang@3.6.2, clang@3.7.1,
|
||||
clang@3.8.1, clang@3.9.1, claws-mail@3.15.0, clutter-gst@3.0.22,
|
||||
clutter-gtk@1.8.2, cmake@3.7.2, cmark@0.27.1, coda@2.18, cogl@1.22.2,
|
||||
conky@1.10.6, connman@1.34, coreutils-minimal@8.26, coreutils@8.26,
|
||||
coreutils@8.27, cppcheck@1.78, cpupower@4.11, cryptsetup-static@1.7.5,
|
||||
cryptsetup@1.7.5, cuirass@0.0.1-6.870e8d6, cups-filters@1.13.1,
|
||||
curl@7.53.0, d-feet@0.3.11, dash@0.5.9.1, datamash@1.1.1, dbus-glib@0.108,
|
||||
dbus@1.10.16, dconf-editor@3.22.1, ddrescue@1.22, denemo@2.1,
|
||||
desktop-file-utils@0.23, devhelp@3.22.0, devil@1.8.0, di@4.43,
|
||||
diamond@0.8.38, diffoscope@81, diffstat@1.61, direnv@2.11.3, dlib@19.3,
|
||||
dmenu@4.7, dnscrypt-proxy@1.9.5, docbook-xml@4.4, docbook-xml@4.5,
|
||||
dosfstools@4.1, dovecot@2.2.29.1, doxygen@1.8.13, dropbear@2017.75,
|
||||
drumkv1@0.8.2, dtc@1.4.4, duplicity@0.7.12, dwm@6.1, e2fsck-static@1.43.4,
|
||||
e2fsprogs@1.43.4, ecl-stumpwm@1.0.0, ecl@16.1.3, ed@1.14.1, efl@1.18.5,
|
||||
elfutils@0.169, elixir@1.4.2, emacs-auctex@11.90.0, emacs-bui@1.1.0,
|
||||
emacs-clojure-mode@5.4.0, emacs-company@0.9.3, emacs-debbugs@0.14,
|
||||
emacs-elfeed@2.1.0, emacs-emms@4.3, emacs-flycheck@30, emacs-guix@0.3.1,
|
||||
emacs-ivy@0.9.1, emacs-magit-popup@2.10.3, emacs-minimal@25.2,
|
||||
emacs-no-x-toolkit@25.2, emacs-no-x@25.2, emacs-org@20170502,
|
||||
emacs-projectile@0.14.0, emacs-seq@2.19, emacs-slime@2.19,
|
||||
emacs-smartparens@1.10.1, emacs-spinner@1.7.3, emacs-with-editor@2.5.10,
|
||||
emacs-zenburn-theme@2.5, emacs@25.2, enlightenment@0.21.7, eog@3.20.5,
|
||||
epiphany@3.22.7, erlang@19.3, ethtool@4.10, eudev@3.2.1, evince@3.22.1,
|
||||
evolution-data-server@3.22.3, exempi@2.4.2, exfat-utils@1.2.6, exim@4.87.1,
|
||||
extra-cmake-modules@5.34.0, extremetuxracer@0.7.4, eyed3@0.7.10,
|
||||
fatfsck-static@4.1, faust@2.0.a51, feh@2.18.3, ffmpeg@2.8.11, ffmpeg@3.3.1,
|
||||
file-roller@3.22.2, fio@2.19, fish@2.5.0, flac@1.3.2, flex@2.6.1,
|
||||
flex@2.6.3, font-abattis-cantarell@0.0.25, font-gnu-unifont@9.0.06,
|
||||
freefall@4.11, freetype@2.7.1, frescobaldi@3.0.0, fuse-exfat@1.2.6,
|
||||
fuse@2.9.7, gajim@0.16.7, gcal@4.1,
|
||||
gcc-cross-sans-libc-arm-none-eabi@5.4.0-1.227977,
|
||||
gcc-cross-sans-libc-arm-none-eabi@6.3.0, gcc-stripped-tarball@5.4.0,
|
||||
gcc-toolchain@4.9.4, gcc-toolchain@5.4.0, gcc-toolchain@6.3.0,
|
||||
gcc-toolchain@7.1.0, gcc@4.8.5, gcc@4.9.4, gcc@5.4.0, gcc@6.3.0, gcc@7.1.0,
|
||||
gcj@5.4.0, gd@2.2.4, gdb-arm-none-eabi@7.12.1, gdb@7.12.1,
|
||||
gdk-pixbuf+svg@2.36.6, gdk-pixbuf@2.36.6, gdm@3.22.1, gedit@3.22.0,
|
||||
geoclue@2.4.6, getmail@4.52.0, gflags@2.2.0, gfortran@6.3.0,
|
||||
gfortran@7.1.0, ghc-quickcheck-instances@0.3.12, ghc-quickcheck@2.8.2,
|
||||
ghc-semigroups@0.18.2, ghc-xmonad-contrib@0.12, ghc@8.0.2,
|
||||
giac-xcas@1.2.3-37, gimp@2.8.22, girara@0.2.7, git-modes@1.2.4, git@2.13.0,
|
||||
gitolite@3.6.6, gjs@1.46.0, glib-networking@2.50.0, glib@2.50.3,
|
||||
glibc-hurd-headers@2.23, glibc-hurd@2.23, glibc-locales@2.25,
|
||||
glibc-utf8-locales@2.25, glibc@2.22, glibc@2.23, glibc@2.24, glibc@2.25,
|
||||
glibmm@2.50.0, global@6.5.6, glpk@4.61, glulxe@0.5.4, gmime@2.6.23,
|
||||
gmp@6.1.2, gmsh@2.16.0, gnome-backgrounds@3.22.1, gnome-calendar@3.22.2,
|
||||
gnome-control-center@3.22.1, gnome-desktop@3.22.2, gnome-klotski@3.22.1,
|
||||
gnome-mines@3.22.2, gnome-mpv@0.11, gnome-online-accounts@3.22.3,
|
||||
gnome-screenshot@3.22.0, gnome-session@3.22.2,
|
||||
gnome-settings-daemon@3.22.1, gnome-shell-extensions@3.22.2,
|
||||
gnome-shell@3.22.2, gnome-sudoku@3.22.2, gnome-system-monitor@3.22.2,
|
||||
gnome-terminal@3.24.1, gnome-themes-standard@3.22.2,
|
||||
gnome-tweak-tool@3.22.0, gnome@3.22.2, gnubik@2.4.3, gnucash@2.6.16,
|
||||
gnupg@2.0.30, gnupg@2.1.20, gnuplot@5.0.6, gnurl@7.54.0, gnutls@3.5.9,
|
||||
go@1.8.1, gobject-introspection@1.50.0, goffice@0.10.34, googletest@1.8.0,
|
||||
gp2c@0.0.10, gparted@0.28.1, gperf@3.1, gpgme@1.9.0,
|
||||
graphicsmagick@1.3.25-2.6156b4c, graphite2@1.3.9, greenisland@0.9.0.1,
|
||||
grep@3.0, grilo-plugins@0.3.3, grilo@0.3.2,
|
||||
gsettings-desktop-schemas@3.22.0, gst-libav@1.12.0, gst-plugins-bad@1.12.0,
|
||||
gst-plugins-base@1.12.0, gst-plugins-good@1.12.0, gst-plugins-ugly@1.12.0,
|
||||
gstreamer@1.12.0, gtk+@3.22.12, gtk-vnc@0.7.0, gtkmm@3.22.0,
|
||||
gtksourceview@3.22.2, guile-aspell@0.4,
|
||||
guile-bytestructures@20170402.91d042e, guile-daemon@0.1.2,
|
||||
guile-json@0.6.0, guile-lib@0.2.5, guile-ncurses@2.2, guile-next@2.2.2,
|
||||
guile-reader@0.6.2, guile-sqlite3@0.0-1.607721f, guile-ssh@0.11.0,
|
||||
guile-static-stripped-tarball@2.0.14, guile-static-stripped@2.0.14,
|
||||
guile2.2-json@0.6.0, guile@2.0.14, guile@2.2.2, guitarix-lv2@0.35.3,
|
||||
guitarix@0.35.3, guix@0.12.0-11.ce92d26, gusb@0.2.9, gvfs@1.30.3,
|
||||
gx-guvnor-lv2@0.1, gx-hyperion-lv2@0.1, gx-super-fuzz-lv2@0.1,
|
||||
gx-suppa-tone-bender-lv2@0.1, gx-vintage-fuzz-master-lv2@0.1,
|
||||
gx-voodoo-fuzz-lv2@0.1, gxtuner@2.4, harfbuzz@1.4.3, haunt@0.2.1,
|
||||
hdf4-alt@4.2.12, hdf4@4.2.12, hdparm@9.52, hexchat@2.12.4,
|
||||
hicolor-icon-theme@0.15, httpd@2.4.25, hwloc@1.11.7, hyperrogue@9.4g,
|
||||
i3status@2.11, ibus-anthy@1.5.9, ibus-libpinyin@1.9.0, ibus@1.5.15,
|
||||
icecat@52.1.0-gnu1, icedtea@3.3.0, icu4c@58.2, idris@1.0,
|
||||
imagemagick@6.9.8-4, imlib2@1.4.10, inkscape@0.92.1, iperf@3.1.7,
|
||||
iproute2@4.10.0, iptables@1.6.1, irssi@1.0.2, ixion@0.12.2, jack@0.125.0,
|
||||
jalv-select@0.8, jalv@1.6.0, jasper@2.0.12, java-ngs@1.3.0, java-xz@1.6,
|
||||
jemalloc@4.5.0, jsoncpp@1.8.0, julia@0.5.1, kactivities-stats@5.34.0,
|
||||
kactivities@5.34.0, kapidox@5.34.0, karchive@5.34.0, kauth@5.34.0,
|
||||
kbd@2.0.4, kbookmarks@5.34.0, kcmutils@5.34.0, kcodecs@5.34.0,
|
||||
kcompletion@5.34.0, kconfig@5.34.0, kconfigwidgets@5.34.0,
|
||||
kcoreaddons@5.34.0, kcrash@5.34.0, kdbusaddons@5.34.0, kdeclarative@5.34.0,
|
||||
kded@5.34.0, kdesignerplugin@5.34.0, kdesu@5.34.0, kdevelop@5.1.0,
|
||||
kdevplatform@5.1.0, kdnssd@5.34.0, kdoctools@5.34.0, kemoticons@5.34.0,
|
||||
kfilemetadata@5.34.0, kglobalaccel@5.34.0, kguiaddons@5.34.0, khal@0.9.5,
|
||||
khard@0.11.4, ki18n@5.34.0, kiconthemes@5.34.0, kidletime@5.34.0,
|
||||
kimageformats@5.34.0, kinit@5.34.0, kio@5.34.0, kitemmodels@5.34.0,
|
||||
kitemviews@5.34.0, kjobwidgets@5.34.0, kmod@24, knewstuff@5.34.0,
|
||||
knotifications@5.34.0, knotifyconfig@5.34.0, kodi@18.0_alpha-4-b8ad238,
|
||||
kpackage@5.34.0, kparts@5.34.0, kpeople@5.34.0, kplotting@5.34.0,
|
||||
kpty@5.34.0, krunner@5.34.0, kservice@5.34.0, ksyntaxhighlighting@5.34.0,
|
||||
ktexteditor@5.34.0, ktextwidgets@5.34.0, kunitconversion@5.34.0,
|
||||
kwallet@5.34.0, kwayland@5.34.0, kwidgetsaddons@5.34.0,
|
||||
kwindowsystem@5.34.0, kxmlgui@5.34.0, kxmlrpcclient@5.34.0, lablgtk@2.18.5,
|
||||
lcms@2.8, ldc@0.17.3, ldc@1.1.1, leptonica@1.74.0, less@487,
|
||||
letsencrypt@0.14.0, lftp@4.7.5, libarchive@3.2.2, libass@0.13.6,
|
||||
libatomic-ops@7.4.4, libbluray@1.0.0, libcap@2.25, libchamplain@0.12.14,
|
||||
libcmis@0.5.1, libdrm@2.4.80, libepoxy@1.4.1, libetonyek@0.1.6,
|
||||
libetpan@1.8, libev@4.24, libevdev@1.5.6, libevent@2.1.8, libffcall@1.12,
|
||||
libfm-extra@1.2.5, libfm@1.2.5, libgc@7.6.0, libgcrypt@1.7.6,
|
||||
libgee@0.18.1, libgit2@0.25.1, libgnomekbd@3.22.0, libgpg-error@1.26,
|
||||
libgsf@1.14.41, libgweather@3.20.4, libiberty@5.4.0, libiconv@1.15,
|
||||
libidn2@0.16, libinput-minimal@1.7.0, libinput@1.7.0, libjpeg@9b,
|
||||
libmp3splt@0.9.2, libmpdclient@2.11, libmtp@1.1.13, libnotify@0.7.7,
|
||||
libosinfo@1.0.0, libpcap@1.8.1, libpciaccess@0.13.5, libpeas@1.20.0,
|
||||
libpinyin@2.0.0, libpng@1.6.28, libpsl@0.17.0, libreoffice@5.3.1.2,
|
||||
librep@0.92.6, libressl@2.5.4, libsamplerate@0.1.9, libseccomp@2.3.2,
|
||||
libsndfile@1.0.28, libsodium@1.0.12, libssh2@1.8.0, libssh@0.7.4,
|
||||
libtasn1@4.10, libtermkey@0.20, libtirpc@1.0.1, libunistring@0.9.7,
|
||||
libupnp@1.6.21, libusb@1.0.21, libuv@1.11.0, libva@1.8.1,
|
||||
libvirt-glib@1.0.0, libvirt@3.2.0, libvpx@1.6.1, libwacom@0.23,
|
||||
libwebp@0.6.0, libwnck@3.20.1, libx11@1.6.5, libx264@20170316-2245,
|
||||
libxcb@1.12, libxfont@2.0.1, libxi@1.7.9, libxkbcommon@0.7.1,
|
||||
libxml++@3.0.1, libxpm@3.5.12, lilv@0.24.2, lilypond@2.19.58,
|
||||
limnoria@2017.03.30, linux-libre-arm-generic@4.11,
|
||||
linux-libre-headers@4.4.47, linux-libre@4.11, linux-libre@4.9.27,
|
||||
linux-pam@1.3.0, llvm@3.6.2, llvm@3.7.1, llvm@3.8.1, llvm@3.9.1, lsof@4.89,
|
||||
lua-lpeg@1.0.1, lua@5.3.4, luajit@2.1.0-beta2, lvm2-static@2.02.171,
|
||||
lvm2@2.02.171, lxterminal@0.3.0, lynx@2.8.9dev.11, lz4@1.7.5, m4@1.4.18,
|
||||
mafft@7.310, magit@2.10.3, mailutils@3.2, maim@4.4.62, man-pages@4.11,
|
||||
manaplus@1.7.3.4, mariadb@10.1.23, mate-themes@3.22.10, mcelog@149,
|
||||
mdadm-static@4.0, mdadm@4.0, mdds@1.2.2, menu-cache@1.0.2,
|
||||
mesa-headers@17.0.4, mesa@17.0.4, mg@20161005, milkytracker@1.0.0,
|
||||
minetest@0.4.15, miniupnpc@2.0.20170421, minixml@2.10, mit-krb5@1.14.4,
|
||||
mlt@6.4.1, moc@2.5.2, mod-host@0.10.6-2.299a39774, modemmanager-qt@5.34.0,
|
||||
moka-icon-theme@5.3.5, moreutils@0.60, mosh@1.3.0, mozjs@38.2.1.rc0,
|
||||
mp3splt@2.6.2, mpd@0.20.6, mpfr@3.1.5, mpv@0.25.0, msgpack@1.4.2,
|
||||
msmtp@1.6.6, mu@0.9.18, multiqc@0.9, mumble@1.2.19, mupdf@1.11, mutt@1.8.2,
|
||||
mutter@3.22.2-1.23c315e, myrepos@1.20170129, mysql@5.7.18, nagios@4.2.4,
|
||||
nano@2.8.2, nautilus@3.22.2, ncbi-vdb@2.8.2, ncmpc@0.27, neon@0.30.2,
|
||||
netsurf@3.6, nettle@3.3, network-manager@1.6.2, networkmanager-qt@5.34.0,
|
||||
nfs-utils@2.1.1, nginx@1.12.0, ngircd@24, ngs-sdk@1.3.0, ninja@1.7.2,
|
||||
nix@1.11.9, nmap@7.40, node@7.8.0, non-sequencer@1.9.5-3.10c31e5,
|
||||
non-session-manager@1.9.5-3.10c31e5, notmuch@0.24.1, nspr@4.14,
|
||||
nss-certs@3.30.2, nss@3.30.2, ntp@4.2.8p10, obs@18.0.2, ocrad@0.26,
|
||||
octave@4.2.1, offlineimap@7.1.0, ola@0.10.3, openjpeg@2.1.2, openssh@7.5p1,
|
||||
openssl@1.1.0e, openvpn@2.4.2, opus@1.1.4, orcus@0.12.1,
|
||||
owncloud-client@2.3.1, oxygen-icons@5.34.0, pango@1.40.3,
|
||||
par2cmdline@0.7.0, parallel@20170422, pari-gp@2.9.1, password-store@1.7.1,
|
||||
pciutils@3.5.4, pcmanfm@1.2.5, pcre2@10.23, pcre@8.40, pcsc-lite@1.8.20,
|
||||
pd@0.47-1, perf@4.11, perl-b-hooks-endofscope@0.21, perl-capture-tiny@0.46,
|
||||
perl-class-load@0.23, perl-clone@0.38, perl-common-sense@3.74,
|
||||
perl-compress-raw-bzip2@2.074, perl-compress-raw-zlib@2.074,
|
||||
perl-cpan-meta-check@0.011, perl-cpan-meta-requirements@2.140,
|
||||
perl-cpan-meta-yaml@0.018, perl-db-file@1.840, perl-dbd-pg@3.5.3,
|
||||
perl-dbd-sqlite@1.54, perl-devel-overloadinfo@0.004,
|
||||
perl-devel-partialdump@0.18, perl-email-mime@1.940,
|
||||
perl-email-simple@2.213, perl-image-exiftool@10.40, perl-io-compress@2.074,
|
||||
perl-lingua-en-findnumber@1.32, perl-lingua-en-inflect-number@1.12,
|
||||
perl-lingua-en-inflect@1.901, perl-lingua-en-number-isordinal@0.05,
|
||||
perl-lingua-en-tagger@0.28, perl-module-runtime-conflicts@0.003,
|
||||
perl-mojolicious@7.29, perl-moose@2.2004,
|
||||
perl-package-deprecationmanager@0.17, perl-params-validate@1.26,
|
||||
perl-parse-cpan-meta@2.150010, perl-scalar-list-utils@1.47,
|
||||
perl-sub-name@0.21, perl-term-readkey@2.37, perl-test-cleannamespaces@0.22,
|
||||
perl-test-exception@0.43, perl-test-simple@1.302078,
|
||||
perl-test-warnings@0.026, perl-time-duration-parse@0.13,
|
||||
perl-variable-magic@0.61, perl-xml-compile-soap@3.21,
|
||||
perl-xml-compile-wsdl11@3.06, perl-yaml@1.23, perl-zip@1.59, phonon@4.9.1,
|
||||
php@7.1.4, pianobar@2016.06.02, pidgin@2.12.0, pioneers@15.4, pius@2.2.4,
|
||||
pkg-config@0.29.1, plasma-framework@5.34.0, podofo@0.9.5,
|
||||
poppler-qt4@0.52.0, poppler-qt5@0.52.0, poppler@0.52.0,
|
||||
portaudio@190600.20161030, postgresql@9.6.3, potrace@1.14,
|
||||
powertabeditor@2.0.0-alpha9, progress@0.13.1, prosody@0.9.12,
|
||||
proteinortho@5.16, proxychains-ng@4.12, psmisc@22.21, pugixml@1.8.1,
|
||||
pulseaudio@10.0, python-acme@0.14.0, python-alembic@0.8.10,
|
||||
python-appdirs@1.4.3, python-atomicwrites@1.1.5, python-babel@2.3.4,
|
||||
python-backports-abc@0.5, python-beautifulsoup4@4.5.3,
|
||||
python-botocore@1.5.26, python-certifi@2017.1.23, python-click-log@0.1.8,
|
||||
python-click@6.7, python-colorama@0.3.7, python-cython@0.25.2,
|
||||
python-dateutil@2.6.0, python-debian@0.1.28, python-decorator@4.0.10,
|
||||
python-dendropy@4.2.0, python-django@1.10.7, python-drmaa@0.7.7,
|
||||
python-email-validator@1.0.2, python-enum34@1.1.6,
|
||||
python-feedgenerator@1.9, python-flake8@2.5.4, python-freezegun@0.3.8,
|
||||
python-graphql-relay@0.4.5, python-greenlet@0.4.11, python-gst@1.12.0,
|
||||
python-icalendar@3.11.4, python-ipaddress@1.0.18, python-ipykernel@4.5.2,
|
||||
python-ipython@5.2.2, python-jupyter-core@4.2.1, python-libvirt@3.2.0,
|
||||
python-llfuse@1.2, python-mako@1.0.6, python-markdown@2.6.8,
|
||||
python-matplotlib@2.0.0, python-minimal-wrapper@3.5.3,
|
||||
python-minimal@3.5.3, python-mistune@0.7.3, python-mutagen@1.36,
|
||||
python-natsort@5.0.2, python-nbxmpp@0.5.5, python-ndg-httpsclient@0.4.2,
|
||||
python-notmuch@0.24.1, python-numexpr@2.6.1, python-numpy@1.12.0,
|
||||
python-orderedmultidict@0.7.11, python-oslosphinx@4.10.0,
|
||||
python-pafy@0.5.3.1, python-pandas@0.19.2, python-paramiko@1.17.4,
|
||||
python-parsedatetime@2.3, python-passlib@1.7.1, python-paste@2.0.3,
|
||||
python-pbr@1.10.0, python-pexpect@4.2.1, python-pip@9.0.1, python-ply@3.9,
|
||||
python-prompt-toolkit@1.0.9, python-psycopg2@2.6.2,
|
||||
python-ptyprocess@0.5.1, python-publicsuffix2@2.20160818, python-py@1.4.32,
|
||||
python-pycparser@2.17, python-pygame@1.9.3, python-pygments@2.1.3,
|
||||
python-pygobject@3.22.0, python-pyicu@1.9.5, python-pyopenssl@17.0.0,
|
||||
python-pyquery@1.2.17, python-pysam@0.10.0, python-pytest-cov@2.4.0,
|
||||
python-pytest-django@3.1.2, python-pytest-runner@2.11.1,
|
||||
python-pytest@3.0.7, python-pytz@2016.10, python-pyyaml@3.12,
|
||||
python-rauth@0.7.3, python-redis@2.10.5, python-requests-mock@1.3.0,
|
||||
python-requests@2.13.0, python-rq@0.7.1, python-s3transfer@0.1.10,
|
||||
python-scikit-learn@0.18.1, python-scipy@0.18.1, python-seaborn@0.7.1,
|
||||
python-setuptools-scm@1.15.0, python-sphinx@1.5.1, python-sphinx@1.5.3,
|
||||
python-sphinxcontrib-programoutput@0.10, python-sqlalchemy-utils@0.32.13,
|
||||
python-statsmodels@0.8.0, python-stem@1.5.4, python-sympy@1.0,
|
||||
python-tabulate@0.7.7, python-testtools@1.4.0, python-texttable@0.8.7,
|
||||
python-tornado@4.5.1, python-unidecode@0.04.20, python-waf@1.9.8,
|
||||
python-wcwidth@0.1.7, python-werkzeug@0.11.15, python-wheel@0.30.0a0,
|
||||
python-wrapper@3.5.3, python-wrapt@1.10.8, python-zope-component@4.3.0,
|
||||
python2-acme@0.14.0, python2-alembic@0.8.10, python2-appdirs@1.4.3,
|
||||
python2-atomicwrites@1.1.5, python2-babel@2.3.4, python2-backports-abc@0.5,
|
||||
python2-beautifulsoup4@4.5.3, python2-botocore@1.5.26,
|
||||
python2-certifi@2017.1.23, python2-click@6.7, python2-colorama@0.3.7,
|
||||
python2-cython@0.25.2, python2-dateutil@2.6.0, python2-debian@0.1.28,
|
||||
python2-decorator@4.0.10, python2-dendropy@4.2.0, python2-django@1.10.7,
|
||||
python2-dogtail@0.9.9, python2-drmaa@0.7.7, python2-email-validator@1.0.2,
|
||||
python2-enum34@1.1.6, python2-feedgenerator@1.9, python2-flake8@2.5.4,
|
||||
python2-freezegun@0.3.8, python2-futures@3.0.5,
|
||||
python2-graphql-relay@0.4.5, python2-greenlet@0.4.11, python2-gst@1.12.0,
|
||||
python2-ipaddress@1.0.18, python2-ipykernel@4.5.2, python2-ipython@5.2.2,
|
||||
python2-jupyter-core@4.2.1, python2-libvirt@3.2.0, python2-llfuse@1.2,
|
||||
python2-mako@1.0.6, python2-markdown@2.6.8, python2-matplotlib@2.0.0,
|
||||
python2-mistune@0.7.3, python2-mutagen@1.36, python2-natsort@5.0.2,
|
||||
python2-nbxmpp@0.5.5, python2-ndg-httpsclient@0.4.2,
|
||||
python2-notmuch@0.24.1, python2-numexpr@2.6.1, python2-numpy@1.12.0,
|
||||
python2-orderedmultidict@0.7.11, python2-oslosphinx@4.10.0,
|
||||
python2-pandas@0.19.2, python2-paramiko@1.17.4, python2-parsedatetime@2.3,
|
||||
python2-passlib@1.7.1, python2-paste@2.0.3, python2-pbr@1.10.0,
|
||||
python2-pexpect@4.2.1, python2-pip@9.0.1, python2-ply@3.9,
|
||||
python2-prompt-toolkit@1.0.9, python2-psycopg2@2.6.2,
|
||||
python2-ptyprocess@0.5.1, python2-publicsuffix2@2.20160818,
|
||||
python2-py@1.4.32, python2-pycparser@2.17, python2-pygments@2.1.3,
|
||||
python2-pygobject@3.22.0, python2-pyicu@1.9.5, python2-pyopenssl@17.0.0,
|
||||
python2-pyquery@1.2.17, python2-pysam@0.10.0, python2-pysqlite@2.8.3,
|
||||
python2-pytest-cov@2.4.0, python2-pytest-django@3.1.2,
|
||||
python2-pytest-runner@2.11.1, python2-pytest@3.0.7, python2-pytz@2016.10,
|
||||
python2-pyyaml@3.12, python2-rauth@0.7.3, python2-redis@2.10.5,
|
||||
python2-requests-mock@1.3.0, python2-requests@2.13.0, python2-rq@0.7.1,
|
||||
python2-s3transfer@0.1.10, python2-scikit-learn@0.18.1,
|
||||
python2-scipy@0.18.1, python2-seaborn@0.7.1, python2-setuptools-scm@1.15.0,
|
||||
python2-sphinx@1.5.1, python2-sphinxcontrib-programoutput@0.10,
|
||||
python2-sqlalchemy-utils@0.32.13, python2-statsmodels@0.8.0,
|
||||
python2-stem@1.5.4, python2-sympy@1.0, python2-tabulate@0.7.7,
|
||||
python2-testtools@1.4.0, python2-texttable@0.8.7, python2-tornado@4.5.1,
|
||||
python2-unidecode@0.04.20, python2-waf@1.9.8, python2-wcwidth@0.1.7,
|
||||
python2-werkzeug@0.11.15, python2-wheel@0.30.0a0, python2-wrapt@1.10.8,
|
||||
python2-xdo@0.3, python2-zope-component@4.3.0, python@3.5.3, qca@2.1.3,
|
||||
qemu-minimal@2.9.0, qemu@2.9.0, qsyncthingtray@0.5.7, qsynth@0.4.4,
|
||||
qt@5.6.2, qtbase@5.7.1, qtconnectivity@5.7.1, qtdeclarative@5.7.1,
|
||||
qtgraphicaleffects@5.7.1, qtimageformats@5.7.1, qtkeychain@0.8.0,
|
||||
qtlocation@5.7.1, qtmultimedia@5.7.1, qtquickcontrols2@5.7.1,
|
||||
qtquickcontrols@5.7.1, qtractor@0.8.1, qtscript@5.7.1, qtsensors@5.7.1,
|
||||
qtserialport@5.7.1, qtsvg@5.7.1, qttools@5.7.1, qtwayland@5.7.1,
|
||||
qtwebchannel@5.7.1, qtwebkit@5.7.1, qtwebsockets@5.7.1, qtx11extras@5.7.1,
|
||||
qtxmlpatterns@5.7.1, r-ade4@1.7-6, r-annotate@1.54.0,
|
||||
r-annotationdbi@1.38.0, r-annotationforge@1.18.0, r-assertthat@0.2.0,
|
||||
r-backports@1.0.5, r-bamsignals@1.8.0, r-bbmisc@1.11, r-bh@1.62.0-1,
|
||||
r-biobase@2.36.0, r-bioccheck@1.12.0, r-biocgenerics@0.22.0,
|
||||
r-biocinstaller@1.26.0, r-biocparallel@1.10.0, r-biocstyle@2.4.0,
|
||||
r-biocviews@1.44.0, r-biomart@2.32.0, r-biostrings@2.44.0,
|
||||
r-bsgenome@1.44.0, r-category@2.42.0, r-chron@2.3-50, r-cluster@2.0.6,
|
||||
r-coda@0.19-1, r-colorspace@1.3-2, r-curl@2.5, r-data-table@1.10.4,
|
||||
r-dbi@0.6-1, r-deseq2@1.16.0, r-digest@0.6.12, r-dnacopy@1.50.0,
|
||||
r-e1071@1.6-8, r-edger@3.18.0, r-estimability@1.2, r-fastcluster@1.1.22,
|
||||
r-gdtools@0.1.4, r-genefilter@1.58.0, r-geneplotter@1.54.0,
|
||||
r-genomation@1.8.0, r-genomeinfodb@1.12.0, r-genomicalignments@1.12.0,
|
||||
r-genomicfeatures@1.28.0, r-genomicranges@1.28.0, r-ggplot2@2.2.1,
|
||||
r-git2r@0.18.0, r-gostats@2.42.0, r-graph@1.54.0, r-grohmm@1.10.0,
|
||||
r-gseabase@1.38.0, r-hexbin@1.27.1-1, r-hmisc@4.0-2, r-hms@0.3,
|
||||
r-htmltable@1.9, r-htmlwidgets@0.8, r-impute@1.50.0, r-iranges@2.10.0,
|
||||
r-jsonlite@1.4, r-knitr@1.15.1, r-lattice@0.20-35, r-limma@3.32.0,
|
||||
r-markdown@0.8, r-matrix@1.2-8, r-matrixstats@0.52.2, r-memoise@1.1.0,
|
||||
r-mgcv@1.8-17, r-motifrg@1.20.0, r-multitaper@1.0-13,
|
||||
r-mutationalpatterns@1.2.0, r-mvtnorm@1.0-6, r-openssl@0.9.6,
|
||||
r-plotly@4.5.6, r-plotrix@3.6-4, r-pracma@2.0.4, r-preprocesscore@1.38.0,
|
||||
r-qtl@1.40-8, r-r-rsp@0.41.0, r-r-utils@2.5.0, r-rbgl@1.52.0, r-rcas@1.1.1,
|
||||
r-rcpp@0.12.10, r-rcpparmadillo@0.7.800.2.0, r-readr@1.1.0,
|
||||
r-rhtslib@1.8.0, r-rmarkdown@1.4, r-roxygen2@6.0.1, r-rpart@4.1-11,
|
||||
r-rsamtools@1.28.0, r-rsqlite@1.1-2, r-rtracklayer@1.36.0, r-rtsne@0.13,
|
||||
r-s4vectors@0.14.0, r-scales@0.4.1, r-seqinr@3.3-6, r-seqlogo@1.42.0,
|
||||
r-seqpattern@1.8.0, r-servr@0.5, r-shortread@1.34.0, r-sparsem@1.76,
|
||||
r-stringi@1.1.5, r-stringr@1.2.0, r-summarizedexperiment@1.6.0,
|
||||
r-survival@2.41-3, r-svglite@1.2.0, r-systempiper@1.10.0, r-tibble@1.3.0,
|
||||
r-tidyr@0.6.1, r-topgo@2.28.0, r-variantannotation@1.22.0, r-vegan@2.4-3,
|
||||
r-viridis@0.4.0, r-viridislite@0.2.0, r-xml2@1.1.1, r-xml@3.98-1.6,
|
||||
r-xvector@0.16.0, r-yaml@2.1.14, r-zlibbioc@1.22.0, r-zoo@1.8-0, r@3.4.0,
|
||||
racket@6.8, radeontop@1.0, radicale@1.1.2, ratpoison@1.4.9,
|
||||
raul@0.8.4-1.f8bf77d3c, raxml@8.2.10, re2@2017-05-01, red-eclipse@1.5.8,
|
||||
retroarch@1.5.0, rhythmbox@3.4.1, rofi@1.3.1, rpcbind@0.2.4,
|
||||
ruby-coderay@1.1.1, ruby-hoe@3.16.0, ruby-minitar@0.5.4-1.e25205ec,
|
||||
ruby-minitest@5.10.1, ruby-nokogiri@1.7.0.1, ruby-pry@0.10.4,
|
||||
ruby-rspec-expectations@3.5.0, ruby-rspec@3.5.0,
|
||||
ruby-shoulda-matchers@3.1.1, ruby-slop@4.1.0, ruby-sqlite3@1.3.13,
|
||||
ruby-yard@0.9.6, rustc@1.16.0, samba@4.5.8, samplv1@0.8.2, samtools@1.3.1,
|
||||
sbcl-stumpwm-with-slynk@1.0.0, sbcl-stumpwm@1.0.0, schismtracker@20170420,
|
||||
screen@4.5.1, sdl-gfx@2.0.26, sed@4.4, serd@0.26.0, serf@1.3.9,
|
||||
sessreg@1.1.1, setbfree@0.8.4, shadow@4.4, shared-mime-info@1.8,
|
||||
shotwell@0.25.5, simple-scan@3.24.1, slock@1.4, slop@5.3.37,
|
||||
slurm@16.05.9.1, snakemake@3.11.2, solid@5.34.0, sonnet@5.34.0,
|
||||
sord@0.16.0, soxr@0.1.2, spice-gtk@0.33, spice-protocol@0.12.12,
|
||||
sqlite@3.17.0, sra-tools@2.8.2-1, sratom@0.6.0, sshfs-fuse@2.9, stagit@0.5,
|
||||
star@2.5.3a, starfighter@1.7, stellarium@0.15.1, strace@4.16,
|
||||
sudo@1.8.19p1, suil@0.8.4, supertux@0.5.1, surf@2.0, synergy@1.8.8,
|
||||
synthv1@0.8.2, talloc@2.1.9, tcl@8.6.6, tcpdump@4.9.0, tcsh@6.20.00,
|
||||
telepathy-mission-control@5.16.4, terminology@1.0.0, texinfo@5.2,
|
||||
texinfo@6.3, the-silver-searcher@1.0.2, thefuck@3.16, threadweaver@5.34.0,
|
||||
tiled@0.18.2, tintin++@2.01.2, tk@8.6.6, tmux@2.4, tomb@2.3, tor@0.3.0.7,
|
||||
totem-pl-parser@3.10.7, totem@3.22.0, trash-cli@0.17.1.14, tuxguitar@1.4,
|
||||
tvtime@1.0.11, txt2man@1.6.0, tzdata@2017a, tzdata@2017b,
|
||||
u-boot-am335x_boneblack@2017.03, u-boot-malta@2017.03,
|
||||
u-boot-vexpress_ca9x4@2017.03, unionfs-fuse-static@2.0, unionfs-fuse@2.0,
|
||||
units@2.14, upower@0.99.4, utf8proc@2.1.0, util-linux@2.29.2,
|
||||
v4l-utils@1.12.3, vala@0.34.4, vapoursynth@37, vc-dwim@1.8,
|
||||
vcftools@0.1.15, vdirsyncer@0.15.0, vim-full@8.0.0566, vim@8.0.0566,
|
||||
virglrenderer@0.6.0, virt-manager@1.4.1, vis@0.3, vsearch@2.4.3,
|
||||
vte-ng@0.48.2.a, vte@0.48.2, w3m@0.5.3+git20170102, wavpack@5.1.0,
|
||||
wayland@1.13.0, wcslib@5.16, webkitgtk@2.16.2, weechat@1.8, weston@2.0.0,
|
||||
wget@1.19.1, whois@5.2.15, windowmaker@0.95.8, wine@2.4, wiredtiger@2.9.1,
|
||||
wireless-regdb@2017.03.07, wireshark@2.2.6, wxwidgets@3.0.2,
|
||||
wxwidgets@3.1.0, x265@2.3, xapian@1.4.4, xauth@1.0.10, xcape@1.2,
|
||||
xcb-proto@1.12, xcb-util-cursor@0.1.3, xcb-util-xrm@1.2, xdg-utils@1.1.1,
|
||||
xf86-input-evdev@2.10.5, xf86-input-libinput@0.25.1,
|
||||
xf86-input-wacom@0.34.0, xf86-video-geode@2.11.19, xf86-video-glint@1.2.9,
|
||||
xf86-video-intel@2.99.917-5-b57abe2, xf86-video-mga@1.6.5,
|
||||
xf86-video-nouveau@1.0.15, xf86-video-nv@2.1.21, xf86-video-qxl@0.1.5,
|
||||
xf86-video-r128@6.10.2, xf86-video-savage@2.3.9,
|
||||
xf86-video-siliconmotion@1.7.9, xf86-video-sis@0.10.9,
|
||||
xf86-video-tdfx@1.4.7, xf86-video-trident@1.3.8, xf86-video-vmware@13.2.1,
|
||||
xfce4-terminal@0.8.3, xkeyboard-config@2.20, xmonad@0.12, xonsh@0.5.9,
|
||||
xorg-server-xwayland@1.19.3, xorg-server@1.19.3, xproto@7.0.31,
|
||||
xscreensaver@5.36, yadifa@2.2.4, yelp@3.22.0, yoshimi@1.5.1.1, yosys@0.7,
|
||||
youtube-dl@2017.05.07, zathura-cb@0.1.6, zathura-djvu@0.2.6,
|
||||
zathura-pdf-poppler@0.2.7, zathura-ps@0.2.4, zathura@0.3.7, zenity@3.22.0,
|
||||
zimg@2.5, zlib@1.2.11, znc@1.6.5
|
||||
|
||||
** Programming interfaces
|
||||
|
||||
*** (guix scripts challenge) returns complete reports, not just discrepancies
|
||||
*** New ‘dub-build-system’ for the D language and Dub
|
||||
*** New ‘ocaml-build-system’ for software written in OCaml
|
||||
*** Improvements to the ‘asdf-build-system’ for software written in various Common Lisp dialects.
|
||||
*** New ‘package-mapping’ procedure to rewrite package dependency graphs
|
||||
*** New modules: (guix workers), (guix discovery), (guix cache),
|
||||
(guix memoization), (guix ssh), (gnu build shepherd)
|
||||
*** (gnu build file-systems) now has support for ISO-9660 file systems.
|
||||
|
||||
** Noteworthy bug fixes
|
||||
|
||||
*** Create home directories once file systems are mounted
|
||||
(<http://bugs.gnu.org/21108>)
|
||||
*** GNU R now builds bit-reproducibly (<https://bugs.gnu.org/25598>)
|
||||
*** The daemon’s default settings are used unless overriden
|
||||
(<https://bugs.gnu.org/20217>)
|
||||
*** ‘guix system’ now supports the common build option ‘--root’
|
||||
(<https://bugs.gnu.org/26271>)
|
||||
*** Mesa uses LLVM for better Gallium performance (<https://bugs.gnu.org/25953>)
|
||||
*** Grafting no longer triggers a download of all the outputs of each derivation
|
||||
(<https://bugs.gnu.org/24886>)
|
||||
*** Home directories are created when using a separate /home
|
||||
(<https://bugs.gnu.org/21108>)
|
||||
|
||||
** Native language support
|
||||
|
||||
Updated translations: fr (French)
|
||||
|
||||
* Changes in 0.12.0 (since 0.11.0)
|
||||
|
||||
** Package management
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
(public-key
|
||||
(ecc
|
||||
(curve Ed25519)
|
||||
(q #8D156F295D24B0D9A86FA5741A840FF2D24F60F7B6C4134814AD55625971B394#)
|
||||
)
|
||||
)
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -22,6 +22,7 @@
|
|||
#:use-module (guix config)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-19)
|
||||
#:use-module (ice-9 match)
|
||||
#:export (build))
|
||||
|
||||
;;; Commentary:
|
||||
|
@ -58,11 +59,43 @@
|
|||
(define xz
|
||||
(first (find-best-packages-by-name "xz" #f)))
|
||||
|
||||
(define (false-if-wrong-guile package)
|
||||
"Return #f if PACKAGE depends on the \"wrong\" major version of Guile (e.g.,
|
||||
2.0 instead of 2.2), otherwise return PACKAGE."
|
||||
(let ((guile (any (match-lambda
|
||||
((label (? package? dep) _ ...)
|
||||
(and (string=? (package-name dep) "guile")
|
||||
dep)))
|
||||
(package-direct-inputs package))))
|
||||
(and (or (not guile)
|
||||
(string-prefix? (effective-version)
|
||||
(package-version guile)))
|
||||
package)))
|
||||
|
||||
(define (package-for-current-guile . names)
|
||||
"Return the package with one of the given NAMES that depends on the current
|
||||
Guile major version (2.0 or 2.2), or #f if none of the packages matches."
|
||||
(let loop ((names names))
|
||||
(match names
|
||||
(()
|
||||
#f)
|
||||
((name rest ...)
|
||||
(match (find-best-packages-by-name name #f)
|
||||
(()
|
||||
(loop rest))
|
||||
((first _ ...)
|
||||
(or (false-if-wrong-guile first)
|
||||
(loop rest))))))))
|
||||
|
||||
(define guile-json
|
||||
(first (find-best-packages-by-name "guile-json" #f)))
|
||||
(package-for-current-guile "guile-json"
|
||||
"guile2.2-json"
|
||||
"guile2.0-json"))
|
||||
|
||||
(define guile-ssh
|
||||
(first (find-best-packages-by-name "guile-ssh" #f)))
|
||||
(package-for-current-guile "guile-ssh"
|
||||
"guile2.2-ssh"
|
||||
"guile2.0-ssh"))
|
||||
|
||||
|
||||
;; The actual build procedure.
|
||||
|
@ -80,6 +113,17 @@ person's version identifier."
|
|||
;; XXX: Replace with a Git commit id.
|
||||
(date->string (current-date 0) "~Y~m~d.~H"))
|
||||
|
||||
(define (guile-for-build)
|
||||
"Return a derivation for Guile 2.0 or 2.2, whichever matches the currently
|
||||
running Guile."
|
||||
(package->derivation (cond-expand
|
||||
(guile-2.2
|
||||
(canonical-package
|
||||
(specification->package "guile@2.2")))
|
||||
(else
|
||||
(canonical-package
|
||||
(specification->package "guile@2.0"))))))
|
||||
|
||||
;; The procedure below is our return value.
|
||||
(define* (build source
|
||||
#:key verbose? (version (date-version-string))
|
||||
|
@ -104,15 +148,19 @@ files."
|
|||
#~(begin
|
||||
(use-modules (guix build pull))
|
||||
|
||||
(let ((json (string-append #$guile-json "/share/guile/site/2.0")))
|
||||
(let ((json (string-append #$guile-json "/share/guile/site/"
|
||||
#$(effective-version))))
|
||||
(set! %load-path
|
||||
(cons* json
|
||||
(string-append #$guile-ssh "/share/guile/site/2.0")
|
||||
%load-path))
|
||||
(cons* json
|
||||
(string-append #$guile-ssh "/share/guile/site/"
|
||||
#$(effective-version))
|
||||
%load-path))
|
||||
(set! %load-compiled-path
|
||||
(cons* json
|
||||
(string-append #$guile-ssh "/lib/guile/2.0/site-ccache")
|
||||
%load-compiled-path)))
|
||||
(cons* json
|
||||
(string-append #$guile-ssh "/lib/guile/"
|
||||
#$(effective-version)
|
||||
"/site-ccache")
|
||||
%load-compiled-path)))
|
||||
|
||||
;; XXX: The 'guile-ssh' package prior to Guix commit 92b7258 was
|
||||
;; broken: libguile-ssh could not be found. Work around that.
|
||||
|
@ -146,13 +194,21 @@ files."
|
|||
(current-error-port)
|
||||
(%make-void-port "w")))))
|
||||
|
||||
(gexp->derivation "guix-latest" builder
|
||||
#:modules '((guix build pull)
|
||||
(guix build utils))
|
||||
(mlet %store-monad ((guile (guile-for-build)))
|
||||
(gexp->derivation "guix-latest" builder
|
||||
#:modules '((guix build pull)
|
||||
(guix build utils)
|
||||
|
||||
;; Arrange so that our own (guix build …) modules are
|
||||
;; used.
|
||||
#:module-path (list (top-source-directory))))
|
||||
;; Closure of (guix modules).
|
||||
(guix modules)
|
||||
(guix memoization)
|
||||
(guix sets))
|
||||
|
||||
;; Arrange so that our own (guix build …) modules are
|
||||
;; used.
|
||||
#:module-path (list (top-source-directory))
|
||||
|
||||
#:guile-for-build guile)))
|
||||
|
||||
;; This file is loaded by 'guix pull'; return it the build procedure.
|
||||
build
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -38,10 +38,13 @@
|
|||
%hydra-supported-systems))
|
||||
(cross (map (cut package-cross-derivation store
|
||||
%bootstrap-tarballs <>)
|
||||
'("mips64el-linux-gnuabi64")))
|
||||
'("mips64el-linux-gnu"
|
||||
"arm-linux-gnueabihf")))
|
||||
(total (append native cross)))
|
||||
|
||||
(set-build-options store #:use-substitutes? #t)
|
||||
(set-build-options store
|
||||
#:use-substitutes? #t
|
||||
#:substitute-urls %default-substitute-urls)
|
||||
(let* ((total (map derivation->output-path total))
|
||||
(available (substitutable-paths store total))
|
||||
(missing (lset-difference string=? total available)))
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -57,7 +57,7 @@
|
|||
if it does."
|
||||
(let ((references (substitutable-references substitute)))
|
||||
(when (any (cut string-contains <> "boot") references)
|
||||
(leave (_ "'~a' refers to bootstrap inputs: ~s~%")
|
||||
(leave (G_ "'~a' refers to bootstrap inputs: ~s~%")
|
||||
(substitutable-path substitute) references))))
|
||||
|
||||
(define (test-final-inputs store system)
|
||||
|
@ -71,7 +71,7 @@ refer to the bootstrap tools."
|
|||
(string=? (substitutable-path substitute)
|
||||
dir))
|
||||
available)
|
||||
(leave (_ "~a (system: ~a) has no substitute~%")
|
||||
(leave (G_ "~a (system: ~a) has no substitute~%")
|
||||
dir system)))
|
||||
inputs)
|
||||
|
||||
|
|
|
@ -24,7 +24,10 @@
|
|||
(guix build utils))
|
||||
|
||||
(define warnings
|
||||
'(unsupported-warning format unbound-variable arity-mismatch))
|
||||
;; FIXME: 'format' is missing because it reports "non-literal format
|
||||
;; strings" due to the fact that we use 'G_' instead of '_'. We'll need
|
||||
;; help from Guile to solve this.
|
||||
'(unsupported-warning unbound-variable arity-mismatch))
|
||||
|
||||
(define host (getenv "host"))
|
||||
|
||||
|
|
|
@ -42,17 +42,15 @@
|
|||
(match (string-tokenize file (char-set-complement (char-set #\/)))
|
||||
((_ ... system basename)
|
||||
(string->uri
|
||||
(match system
|
||||
("aarch64-linux"
|
||||
(string-append "http://flashner.co.il/guix/bootstrap/aarch64-linux"
|
||||
"/20170217/" basename))
|
||||
(_ (string-append %url-base "/" system
|
||||
(match system
|
||||
("armhf-linux"
|
||||
"/20150101/")
|
||||
(_
|
||||
"/20131110/"))
|
||||
basename)))))))
|
||||
(string-append %url-base "/" system
|
||||
(match system
|
||||
("aarch64-linux"
|
||||
"/20170217/")
|
||||
("armhf-linux"
|
||||
"/20150101/")
|
||||
(_
|
||||
"/20131110/"))
|
||||
basename)))))
|
||||
|
||||
(match (command-line)
|
||||
((_ file expected-hash)
|
||||
|
|
|
@ -0,0 +1,226 @@
|
|||
#!/bin/sh
|
||||
# Print a version string.
|
||||
scriptversion=2017-01-09.19; # UTC
|
||||
|
||||
# Copyright (C) 2007-2017 Free Software Foundation, Inc.
|
||||
#
|
||||
# This program 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.
|
||||
#
|
||||
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
|
||||
# It may be run two ways:
|
||||
# - from a git repository in which the "git describe" command below
|
||||
# produces useful output (thus requiring at least one signed tag)
|
||||
# - from a non-git-repo directory containing a .tarball-version file, which
|
||||
# presumes this script is invoked like "./git-version-gen .tarball-version".
|
||||
|
||||
# In order to use intra-version strings in your project, you will need two
|
||||
# separate generated version string files:
|
||||
#
|
||||
# .tarball-version - present only in a distribution tarball, and not in
|
||||
# a checked-out repository. Created with contents that were learned at
|
||||
# the last time autoconf was run, and used by git-version-gen. Must not
|
||||
# be present in either $(srcdir) or $(builddir) for git-version-gen to
|
||||
# give accurate answers during normal development with a checked out tree,
|
||||
# but must be present in a tarball when there is no version control system.
|
||||
# Therefore, it cannot be used in any dependencies. GNUmakefile has
|
||||
# hooks to force a reconfigure at distribution time to get the value
|
||||
# correct, without penalizing normal development with extra reconfigures.
|
||||
#
|
||||
# .version - present in a checked-out repository and in a distribution
|
||||
# tarball. Usable in dependencies, particularly for files that don't
|
||||
# want to depend on config.h but do want to track version changes.
|
||||
# Delete this file prior to any autoconf run where you want to rebuild
|
||||
# files to pick up a version string change; and leave it stale to
|
||||
# minimize rebuild time after unrelated changes to configure sources.
|
||||
#
|
||||
# As with any generated file in a VC'd directory, you should add
|
||||
# /.version to .gitignore, so that you don't accidentally commit it.
|
||||
# .tarball-version is never generated in a VC'd directory, so needn't
|
||||
# be listed there.
|
||||
#
|
||||
# Use the following line in your configure.ac, so that $(VERSION) will
|
||||
# automatically be up-to-date each time configure is run (and note that
|
||||
# since configure.ac no longer includes a version string, Makefile rules
|
||||
# should not depend on configure.ac for version updates).
|
||||
#
|
||||
# AC_INIT([GNU project],
|
||||
# m4_esyscmd([build-aux/git-version-gen .tarball-version]),
|
||||
# [bug-project@example])
|
||||
#
|
||||
# Then use the following lines in your Makefile.am, so that .version
|
||||
# will be present for dependencies, and so that .version and
|
||||
# .tarball-version will exist in distribution tarballs.
|
||||
#
|
||||
# EXTRA_DIST = $(top_srcdir)/.version
|
||||
# BUILT_SOURCES = $(top_srcdir)/.version
|
||||
# $(top_srcdir)/.version:
|
||||
# echo $(VERSION) > $@-t && mv $@-t $@
|
||||
# dist-hook:
|
||||
# echo $(VERSION) > $(distdir)/.tarball-version
|
||||
|
||||
|
||||
me=$0
|
||||
|
||||
version="git-version-gen $scriptversion
|
||||
|
||||
Copyright 2011 Free Software Foundation, Inc.
|
||||
There is NO warranty. You may redistribute this software
|
||||
under the terms of the GNU General Public License.
|
||||
For more information about these matters, see the files named COPYING."
|
||||
|
||||
usage="\
|
||||
Usage: $me [OPTION]... \$srcdir/.tarball-version [TAG-NORMALIZATION-SED-SCRIPT]
|
||||
Print a version string.
|
||||
|
||||
Options:
|
||||
|
||||
--prefix PREFIX prefix of git tags (default 'v')
|
||||
--fallback VERSION
|
||||
fallback version to use if \"git --version\" fails
|
||||
|
||||
--help display this help and exit
|
||||
--version output version information and exit
|
||||
|
||||
Running without arguments will suffice in most cases."
|
||||
|
||||
prefix=v
|
||||
fallback=
|
||||
|
||||
while test $# -gt 0; do
|
||||
case $1 in
|
||||
--help) echo "$usage"; exit 0;;
|
||||
--version) echo "$version"; exit 0;;
|
||||
--prefix) shift; prefix=${1?};;
|
||||
--fallback) shift; fallback=${1?};;
|
||||
-*)
|
||||
echo "$0: Unknown option '$1'." >&2
|
||||
echo "$0: Try '--help' for more information." >&2
|
||||
exit 1;;
|
||||
*)
|
||||
if test "x$tarball_version_file" = x; then
|
||||
tarball_version_file="$1"
|
||||
elif test "x$tag_sed_script" = x; then
|
||||
tag_sed_script="$1"
|
||||
else
|
||||
echo "$0: extra non-option argument '$1'." >&2
|
||||
exit 1
|
||||
fi;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
if test "x$tarball_version_file" = x; then
|
||||
echo "$usage"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
tag_sed_script="${tag_sed_script:-s/x/x/}"
|
||||
|
||||
nl='
|
||||
'
|
||||
|
||||
# Avoid meddling by environment variable of the same name.
|
||||
v=
|
||||
v_from_git=
|
||||
|
||||
# First see if there is a tarball-only version file.
|
||||
# then try "git describe", then default.
|
||||
if test -f $tarball_version_file
|
||||
then
|
||||
v=`cat $tarball_version_file` || v=
|
||||
case $v in
|
||||
*$nl*) v= ;; # reject multi-line output
|
||||
[0-9]*) ;;
|
||||
*) v= ;;
|
||||
esac
|
||||
test "x$v" = x \
|
||||
&& echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2
|
||||
fi
|
||||
|
||||
if test "x$v" != x
|
||||
then
|
||||
: # use $v
|
||||
# Otherwise, if there is at least one git commit involving the working
|
||||
# directory, and "git describe" output looks sensible, use that to
|
||||
# derive a version string.
|
||||
elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
|
||||
&& v=`git describe --abbrev=4 --match="$prefix*" HEAD 2>/dev/null \
|
||||
|| git describe --abbrev=4 HEAD 2>/dev/null` \
|
||||
&& v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \
|
||||
&& case $v in
|
||||
$prefix[0-9]*) ;;
|
||||
*) (exit 1) ;;
|
||||
esac
|
||||
then
|
||||
# Is this a new git that lists number of commits since the last
|
||||
# tag or the previous older version that did not?
|
||||
# Newer: v6.10-77-g0f8faeb
|
||||
# Older: v6.10-g0f8faeb
|
||||
case $v in
|
||||
*-*-*) : git describe is okay three part flavor ;;
|
||||
*-*)
|
||||
: git describe is older two part flavor
|
||||
# Recreate the number of commits and rewrite such that the
|
||||
# result is the same as if we were using the newer version
|
||||
# of git describe.
|
||||
vtag=`echo "$v" | sed 's/-.*//'`
|
||||
commit_list=`git rev-list "$vtag"..HEAD 2>/dev/null` \
|
||||
|| { commit_list=failed;
|
||||
echo "$0: WARNING: git rev-list failed" 1>&2; }
|
||||
numcommits=`echo "$commit_list" | wc -l`
|
||||
v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
|
||||
test "$commit_list" = failed && v=UNKNOWN
|
||||
;;
|
||||
esac
|
||||
|
||||
# Change the first '-' to a '.', so version-comparing tools work properly.
|
||||
# Remove the "g" in git describe's output string, to save a byte.
|
||||
v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
|
||||
v_from_git=1
|
||||
elif test "x$fallback" = x || git --version >/dev/null 2>&1; then
|
||||
v=UNKNOWN
|
||||
else
|
||||
v=$fallback
|
||||
fi
|
||||
|
||||
v=`echo "$v" |sed "s/^$prefix//"`
|
||||
|
||||
# Test whether to append the "-dirty" suffix only if the version
|
||||
# string we're using came from git. I.e., skip the test if it's "UNKNOWN"
|
||||
# or if it came from .tarball-version.
|
||||
if test "x$v_from_git" != x; then
|
||||
# Don't declare a version "dirty" merely because a timestamp has changed.
|
||||
git update-index --refresh > /dev/null 2>&1
|
||||
|
||||
dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty=
|
||||
case "$dirty" in
|
||||
'') ;;
|
||||
*) # Append the suffix only if there isn't one already.
|
||||
case $v in
|
||||
*-dirty) ;;
|
||||
*) v="$v-dirty" ;;
|
||||
esac ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Omit the trailing newline, so that m4_esyscmd can use the result directly.
|
||||
printf %s "$v"
|
||||
|
||||
# Local variables:
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-time-zone: "UTC0"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -32,6 +32,13 @@
|
|||
(beautify-user-module! m)
|
||||
m))
|
||||
|
||||
(cond-expand
|
||||
(guile-2.2
|
||||
;; Guile 2.2.2 has a bug whereby 'time-monotonic' objects have seconds and
|
||||
;; nanoseconds swapped (fixed in Guile commit 886ac3e). Work around it.
|
||||
(define time-monotonic time-tai))
|
||||
(else #t))
|
||||
|
||||
(define (call-with-time thunk kont)
|
||||
"Call THUNK and pass KONT the elapsed time followed by THUNK's return
|
||||
values."
|
||||
|
|
|
@ -111,7 +111,7 @@ SYSTEM."
|
|||
;; chain.)
|
||||
(list gcc-4.8 gcc-4.9 gcc-5 glibc binutils
|
||||
gmp mpfr mpc coreutils findutils diffutils patch sed grep
|
||||
gawk gnu-gettext hello guile-2.0 zlib gzip xz
|
||||
gawk gnu-gettext hello guile-2.0 guile-2.2 zlib gzip xz
|
||||
%bootstrap-binaries-tarball
|
||||
%binutils-bootstrap-tarball
|
||||
(%glibc-bootstrap-tarball)
|
||||
|
|
|
@ -0,0 +1,161 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 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/>.
|
||||
|
||||
;;; Commentary:
|
||||
;;;
|
||||
;;; This script updates the list of new and updated packages in 'NEWS'.
|
||||
;;;
|
||||
;;; Code:
|
||||
|
||||
(use-modules (gnu) (guix)
|
||||
(guix build utils)
|
||||
((guix ui) #:select (fill-paragraph))
|
||||
(srfi srfi-1)
|
||||
(srfi srfi-11)
|
||||
(ice-9 match)
|
||||
(ice-9 rdelim)
|
||||
(ice-9 regex)
|
||||
(ice-9 pretty-print))
|
||||
|
||||
(define %header-rx
|
||||
(make-regexp "^\\* Changes in (version )?([0-9.]+) \\(since ([0-9.]+)\\)"))
|
||||
|
||||
(define (NEWS->versions port)
|
||||
"Return two values: the previous version and the current version as read
|
||||
from PORT, which is an input port on the 'NEWS' file."
|
||||
(let loop ()
|
||||
(let ((line (read-line port)))
|
||||
(cond ((eof-object? line)
|
||||
(error "failed to determine previous and current version"
|
||||
port))
|
||||
((regexp-exec %header-rx line)
|
||||
=>
|
||||
(lambda (match)
|
||||
(values (match:substring match 3)
|
||||
(match:substring match 2))))
|
||||
(else
|
||||
(loop))))))
|
||||
|
||||
(define (skip-to-org-heading port)
|
||||
"Read from PORT until an Org heading is found."
|
||||
(let loop ()
|
||||
(let ((next (peek-char port)))
|
||||
(cond ((eqv? next #\*)
|
||||
#t)
|
||||
((eof-object? next)
|
||||
(error "next heading could not be found"))
|
||||
(else
|
||||
(read-line port)
|
||||
(loop))))))
|
||||
|
||||
(define (rewrite-org-section input output heading-rx proc)
|
||||
"Write to OUTPUT the text read from INPUT, but with the first Org section
|
||||
matching HEADING-RX replaced by NEW-HEADING and CONTENTS."
|
||||
(let loop ()
|
||||
(let ((line (read-line input)))
|
||||
(cond ((eof-object? line)
|
||||
(error "failed to match heading regexp" heading-rx))
|
||||
((regexp-exec heading-rx line)
|
||||
=>
|
||||
(lambda (match)
|
||||
(proc match output)
|
||||
(skip-to-org-heading input)
|
||||
(dump-port input output)
|
||||
#t))
|
||||
(else
|
||||
(display line output)
|
||||
(newline output)
|
||||
(loop))))))
|
||||
|
||||
(define (enumeration->paragraph lst)
|
||||
"Turn LST, a list of strings, into a single string that is a ready-to-print
|
||||
paragraph."
|
||||
(fill-paragraph (string-join (sort lst string<?) ", ")
|
||||
75))
|
||||
|
||||
(define (write-packages-added news-file old new)
|
||||
"Write to NEWS-FILE the list of packages added between OLD and NEW."
|
||||
(let ((added (lset-difference string=? (map car new) (map car old))))
|
||||
(with-atomic-file-replacement news-file
|
||||
(lambda (input output)
|
||||
(rewrite-org-section input output
|
||||
(make-regexp "^(\\*+) (.*) new packages")
|
||||
(lambda (match port)
|
||||
(let ((stars (match:substring match 1)))
|
||||
(format port
|
||||
"~a ~a new packages~%~%~a~%~%"
|
||||
stars (length added)
|
||||
(enumeration->paragraph added)))))))))
|
||||
|
||||
(define (write-packages-updates news-file old new)
|
||||
"Write to NEWS-FILE the list of packages upgraded between OLD and NEW."
|
||||
(let ((upgraded (filter-map (match-lambda
|
||||
((package . new-version)
|
||||
(match (assoc package old)
|
||||
((_ . old-version)
|
||||
(and (version>? new-version old-version)
|
||||
(string-append package "@"
|
||||
new-version)))
|
||||
(_ #f))))
|
||||
new)))
|
||||
(with-atomic-file-replacement news-file
|
||||
(lambda (input output)
|
||||
(rewrite-org-section input output
|
||||
(make-regexp "^(\\*+) (.*) package updates")
|
||||
(lambda (match port)
|
||||
(let ((stars (match:substring match 1)))
|
||||
(format port
|
||||
"~a ~a package updates~%~%~a~%~%"
|
||||
stars (length upgraded)
|
||||
(enumeration->paragraph upgraded)))))))))
|
||||
|
||||
|
||||
(define (main . args)
|
||||
(match args
|
||||
((news-file data-directory)
|
||||
;; Don't browse things listed in the user's $GUIX_PACKAGE_PATH. Here we
|
||||
;; assume that the last item in (%package-module-path) is the distro
|
||||
;; directory.
|
||||
(parameterize ((%package-module-path
|
||||
(list (last (%package-module-path)))))
|
||||
(define (package-file version)
|
||||
(string-append data-directory "/packages-"
|
||||
version ".txt"))
|
||||
|
||||
(let-values (((previous-version new-version)
|
||||
(call-with-input-file news-file NEWS->versions)))
|
||||
(let* ((old (call-with-input-file (package-file previous-version)
|
||||
read))
|
||||
(new (fold-packages (lambda (p r)
|
||||
(alist-cons (package-name p) (package-version p)
|
||||
r))
|
||||
'())))
|
||||
(call-with-output-file (package-file new-version)
|
||||
(lambda (port)
|
||||
(pretty-print new port)))
|
||||
|
||||
(write-packages-added news-file old new)
|
||||
(write-packages-updates news-file old new)))))
|
||||
(x
|
||||
(format (current-error-port) "Usage: update-NEWS NEWS-FILE DATA-DIRECTORY
|
||||
|
||||
Update the list of new and updated packages in NEWS-FILE using the
|
||||
previous-version package list from DATA-DIRECTORY.\n")
|
||||
(exit 1))))
|
||||
|
||||
(apply main (cdr (command-line)))
|
|
@ -0,0 +1,144 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 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/>.
|
||||
|
||||
;;; Commentary:
|
||||
;;;
|
||||
;;; This scripts updates the definition of the 'guix' package in Guix for the
|
||||
;;; current commit. It requires Git to be installed.
|
||||
;;;
|
||||
;;; Code:
|
||||
|
||||
(use-modules (guix)
|
||||
(guix git-download)
|
||||
(guix upstream)
|
||||
(guix utils)
|
||||
(guix base32)
|
||||
(guix build utils)
|
||||
(gnu packages package-management)
|
||||
(ice-9 match))
|
||||
|
||||
(define %top-srcdir
|
||||
(string-append (current-source-directory) "/.."))
|
||||
|
||||
(define version-controlled?
|
||||
(git-predicate %top-srcdir))
|
||||
|
||||
(define (package-definition-location)
|
||||
"Return the source properties of the definition of the 'guix' package."
|
||||
(call-with-input-file (location-file (package-location guix))
|
||||
(lambda (port)
|
||||
(let loop ()
|
||||
(match (read port)
|
||||
((? eof-object?)
|
||||
(error "definition of 'guix' package could not be found"
|
||||
(port-filename port)))
|
||||
(('define-public 'guix value)
|
||||
(source-properties value))
|
||||
(_
|
||||
(loop)))))))
|
||||
|
||||
(define* (update-definition commit hash
|
||||
#:key version old-hash)
|
||||
"Return a one-argument procedure that takes a string, the definition of the
|
||||
'guix' package, and returns a string, the update definition for VERSION,
|
||||
COMMIT."
|
||||
(define (linear-offset str line column)
|
||||
;; Return the offset in characters to reach LINE and COLUMN (both
|
||||
;; zero-indexed) in STR.
|
||||
(call-with-input-string str
|
||||
(lambda (port)
|
||||
(let loop ((offset 0))
|
||||
(cond ((and (= (port-column port) column)
|
||||
(= (port-line port) line))
|
||||
offset)
|
||||
((eof-object? (read-char port))
|
||||
(error "line and column not reached!"
|
||||
str))
|
||||
(else
|
||||
(loop (+ 1 offset))))))))
|
||||
|
||||
(define (update-hash str)
|
||||
;; Replace OLD-HASH with HASH in STR.
|
||||
(string-replace-substring str
|
||||
(bytevector->nix-base32-string old-hash)
|
||||
(bytevector->nix-base32-string hash)))
|
||||
|
||||
(lambda (str)
|
||||
(match (call-with-input-string str read)
|
||||
(('let (('version old-version)
|
||||
('commit old-commit)
|
||||
('revision old-revision))
|
||||
defn)
|
||||
(let* ((location (source-properties defn))
|
||||
(line (assq-ref location 'line))
|
||||
(column 0)
|
||||
(offset (linear-offset str line column)))
|
||||
(string-append (format #f "(let ((version \"~a\")
|
||||
(commit \"~a\")
|
||||
(revision ~a))\n"
|
||||
(or version old-version)
|
||||
commit
|
||||
(if (and version
|
||||
(not (string=? version old-version)))
|
||||
0
|
||||
(+ 1 old-revision)))
|
||||
(string-drop (update-hash str) offset))))
|
||||
(exp
|
||||
(error "'guix' package definition is not as expected" exp)))))
|
||||
|
||||
|
||||
(define (main . args)
|
||||
(match args
|
||||
((commit version)
|
||||
(with-store store
|
||||
(let* ((source (add-to-store store
|
||||
"guix-checkout" ;dummy name
|
||||
#t "sha256" %top-srcdir
|
||||
#:select? version-controlled?))
|
||||
(hash (query-path-hash store source))
|
||||
(location (package-definition-location))
|
||||
(old-hash (origin-sha256 (package-source guix))))
|
||||
(edit-expression location
|
||||
(update-definition commit hash
|
||||
#:old-hash old-hash
|
||||
#:version version))
|
||||
|
||||
;; Re-add SOURCE to the store, but this time under the real name used
|
||||
;; in the 'origin'. This allows us to build the package without
|
||||
;; having to make a real checkout; thus, it also works when working
|
||||
;; on a private branch.
|
||||
(reload-module
|
||||
(resolve-module '(gnu packages package-management)))
|
||||
|
||||
(let* ((source (add-to-store store
|
||||
(origin-file-name (package-source guix))
|
||||
#t "sha256" source))
|
||||
(root (store-path-package-name source)))
|
||||
|
||||
;; Add an indirect GC root for SOURCE in the current directory.
|
||||
(false-if-exception (delete-file root))
|
||||
(symlink source root)
|
||||
(add-indirect-root store root)
|
||||
|
||||
(format #t "source code for commit ~a: ~a (GC root: ~a)~%"
|
||||
commit source root)))))
|
||||
((commit)
|
||||
;; Automatically deduce the version and revision numbers.
|
||||
(main commit #f))))
|
||||
|
||||
(apply main (cdr (command-line)))
|
|
@ -2,8 +2,10 @@
|
|||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.68)
|
||||
AC_INIT([GNU Guix], [0.12.0], [bug-guix@gnu.org], [guix],
|
||||
[http://www.gnu.org/software/guix/])
|
||||
AC_INIT([GNU Guix],
|
||||
[m4_esyscmd([build-aux/git-version-gen .tarball-version])],
|
||||
[bug-guix@gnu.org], [guix],
|
||||
[https://www.gnu.org/software/guix/])
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
|
||||
AM_INIT_AUTOMAKE([1.12 gnu silent-rules subdir-objects \
|
||||
|
|
|
@ -248,7 +248,10 @@ please do read it.
|
|||
|
||||
Some special forms introduced in Guix, such as the @code{substitute*}
|
||||
macro, have special indentation rules. These are defined in the
|
||||
@file{.dir-locals.el} file, which Emacs automatically uses.
|
||||
@file{.dir-locals.el} file, which Emacs automatically uses. Also note
|
||||
that Emacs-Guix provides @code{guix-devel-mode} mode that indents and
|
||||
highlights Guix code properly (@pxref{Development,,, emacs-guix, The
|
||||
Emacs-Guix Reference Manual}).
|
||||
|
||||
@cindex indentation, of code
|
||||
@cindex formatting, of code
|
||||
|
@ -342,9 +345,30 @@ For important changes, check that dependent package (if applicable) are
|
|||
not affected by the change; @code{guix refresh --list-dependent
|
||||
@var{package}} will help you do that (@pxref{Invoking guix refresh}).
|
||||
|
||||
Packages with roughly 100 dependents or more usually have to be
|
||||
committed to a separate branch. That branch can then be built
|
||||
separately by our build farm, and later merged into @code{master} once
|
||||
@c See <https://lists.gnu.org/archive/html/guix-devel/2016-10/msg00933.html>.
|
||||
@cindex branching strategy
|
||||
@cindex rebuild scheduling strategy
|
||||
Depending on the number of dependent packages and thus the amount of
|
||||
rebuilding induced, commits go to different branches, along these lines:
|
||||
|
||||
@table @asis
|
||||
@item 300 dependent packages or less
|
||||
@code{master} branch (non-disruptive changes).
|
||||
|
||||
@item between 300 and 1,200 dependent packages
|
||||
@code{staging} branch (non-disruptive changes). This branch is intended
|
||||
to be merged in @code{master} every 3 weeks or so. Topical changes
|
||||
(e.g., an update of the GNOME stack) can instead go to a specific branch
|
||||
(say, @code{gnome-updates}).
|
||||
|
||||
@item more than 1,200 dependent packages
|
||||
@code{core-updates} branch (may include major and potentially disruptive
|
||||
changes). This branch is intended to be merged in @code{master} every
|
||||
2.5 months or so.
|
||||
@end table
|
||||
|
||||
All these branches are tracked by our build farm
|
||||
and merged into @code{master} once
|
||||
everything has been successfully built. This allows us to fix issues
|
||||
before they hit users, and to reduce the window during which pre-built
|
||||
binaries are not available.
|
||||
|
|
704
doc/guix.texi
704
doc/guix.texi
File diff suppressed because it is too large
Load Diff
|
@ -219,7 +219,9 @@ emacs node ${EMACS}/html_node/emacs/
|
|||
easejs mono ${GS}/easejs/manual/easejs.html
|
||||
easejs node ${GS}/easejs/manual/
|
||||
|
||||
emacs-guix mono https://notabug.org/alezost/emacs-guix
|
||||
EMACS_GUIX = https://alezost.github.io/guix.el/manual/latest
|
||||
emacs-guix mono ${EMACS_GUIX}/emacs-guix.html
|
||||
emacs-guix node ${EMACS_GUIX}/html_node/index.html
|
||||
|
||||
emacs-muse node ${GS}/emacs-muse/manual/muse.html
|
||||
emacs-muse node ${GS}/emacs-muse/manual/html_node/
|
||||
|
|
|
@ -13,7 +13,9 @@ StandardOutput=syslog
|
|||
StandardError=syslog
|
||||
|
||||
# See <https://lists.gnu.org/archive/html/guix-devel/2016-04/msg00608.html>.
|
||||
TasksMax=1024
|
||||
# Some package builds (for example, go@1.8.1) may require even more than
|
||||
# 1024 tasks.
|
||||
TasksMax=8192
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
|
@ -26,10 +26,10 @@
|
|||
|
||||
;;; Code:
|
||||
|
||||
;; Load Scheme indentation rules from the current directory.
|
||||
;; Load Scheme indentation rules from ".dir-locals.el".
|
||||
(with-temp-buffer
|
||||
(scheme-mode)
|
||||
(let ((default-directory (file-name-as-directory "."))
|
||||
(let ((default-directory (file-name-as-directory load-file-name))
|
||||
(enable-local-variables :all))
|
||||
(hack-dir-local-variables)
|
||||
(hack-local-variables-apply)))
|
||||
|
|
4
gnu.scm
4
gnu.scm
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015 Joshua S. Grant <jgrant@parenthetical.io>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -34,7 +35,8 @@
|
|||
'((gnu system)
|
||||
(gnu system mapped-devices)
|
||||
(gnu system file-systems)
|
||||
(gnu system grub) ; 'grub-configuration'
|
||||
(gnu bootloader)
|
||||
(gnu bootloader grub)
|
||||
(gnu system pam)
|
||||
(gnu system shadow) ; 'user-account'
|
||||
(gnu system linux-initrd)
|
||||
|
|
|
@ -0,0 +1,127 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;;
|
||||
;;; 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 bootloader)
|
||||
#:use-module (guix discovery)
|
||||
#:use-module (guix records)
|
||||
#:use-module (guix ui)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:export (bootloader
|
||||
bootloader?
|
||||
bootloader-name
|
||||
bootloader-package
|
||||
bootloader-installer
|
||||
bootloader-configuration-file
|
||||
bootloader-configuration-file-generator
|
||||
|
||||
bootloader-configuration
|
||||
bootloader-configuration?
|
||||
bootloader-configuration-bootloader
|
||||
bootloader-configuration-device
|
||||
bootloader-configuration-menu-entries
|
||||
bootloader-configuration-default-entry
|
||||
bootloader-configuration-timeout
|
||||
bootloader-configuration-theme
|
||||
bootloader-configuration-terminal-outputs
|
||||
bootloader-configuration-terminal-inputs
|
||||
bootloader-configuration-serial-unit
|
||||
bootloader-configuration-serial-speed
|
||||
bootloader-configuration-additional-configuration
|
||||
|
||||
%bootloaders
|
||||
lookup-bootloader-by-name))
|
||||
|
||||
|
||||
;;;
|
||||
;;; Bootloader record.
|
||||
;;;
|
||||
|
||||
;; The <bootloader> record contains fields expressing how the bootloader
|
||||
;; should be installed. Every bootloader in gnu/bootloader/ directory
|
||||
;; has to be described by this record.
|
||||
|
||||
(define-record-type* <bootloader>
|
||||
bootloader make-bootloader
|
||||
bootloader?
|
||||
(name bootloader-name)
|
||||
(package bootloader-package)
|
||||
(installer bootloader-installer)
|
||||
(configuration-file bootloader-configuration-file)
|
||||
(configuration-file-generator bootloader-configuration-file-generator))
|
||||
|
||||
|
||||
;;;
|
||||
;;; Bootloader configuration record.
|
||||
;;;
|
||||
|
||||
;; The <bootloader-configuration> record contains bootloader independant
|
||||
;; configuration used to fill bootloader configuration file.
|
||||
|
||||
(define-record-type* <bootloader-configuration>
|
||||
bootloader-configuration make-bootloader-configuration
|
||||
bootloader-configuration?
|
||||
(bootloader bootloader-configuration-bootloader) ; <bootloader>
|
||||
(device bootloader-configuration-device ; string
|
||||
(default #f))
|
||||
(menu-entries bootloader-configuration-menu-entries ; list of <boot-parameters>
|
||||
(default '()))
|
||||
(default-entry bootloader-configuration-default-entry ; integer
|
||||
(default 0))
|
||||
(timeout bootloader-configuration-timeout ; seconds as integer
|
||||
(default 5))
|
||||
(theme bootloader-configuration-theme ; bootloader-specific theme
|
||||
(default #f))
|
||||
(terminal-outputs bootloader-configuration-terminal-outputs ; list of symbols
|
||||
(default '(gfxterm)))
|
||||
(terminal-inputs bootloader-configuration-terminal-inputs ; list of symbols
|
||||
(default '()))
|
||||
(serial-unit bootloader-configuration-serial-unit ; integer | #f
|
||||
(default #f))
|
||||
(serial-speed bootloader-configuration-serial-speed ; integer | #f
|
||||
(default #f))
|
||||
(additional-configuration bootloader-configuration-additional-configuration ; record
|
||||
(default #f)))
|
||||
|
||||
|
||||
;;;
|
||||
;;; Bootloaders.
|
||||
;;;
|
||||
|
||||
(define (bootloader-modules)
|
||||
"Return the list of bootloader modules."
|
||||
(all-modules (map (lambda (entry)
|
||||
`(,entry . "gnu/bootloader"))
|
||||
%load-path)))
|
||||
|
||||
(define %bootloaders
|
||||
;; The list of publically-known bootloaders.
|
||||
(delay (fold-module-public-variables (lambda (obj result)
|
||||
(if (bootloader? obj)
|
||||
(cons obj result)
|
||||
result))
|
||||
'()
|
||||
(bootloader-modules))))
|
||||
|
||||
(define (lookup-bootloader-by-name name)
|
||||
"Return the bootloader called NAME."
|
||||
(or (find (lambda (bootloader)
|
||||
(eq? name (bootloader-name bootloader)))
|
||||
(force %bootloaders))
|
||||
(leave (G_ "~a: no such bootloader~%") name)))
|
|
@ -0,0 +1,120 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu bootloader extlinux)
|
||||
#:use-module (gnu bootloader)
|
||||
#:use-module (gnu system)
|
||||
#:use-module (gnu packages bootloaders)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix monads)
|
||||
#:use-module (guix records)
|
||||
#:use-module (guix utils)
|
||||
#:export (extlinux-bootloader))
|
||||
|
||||
(define* (extlinux-configuration-file config entries
|
||||
#:key
|
||||
(system (%current-system))
|
||||
(old-entries '()))
|
||||
"Return the U-Boot configuration file corresponding to CONFIG, a
|
||||
<u-boot-configuration> object, and where the store is available at STORE-FS, a
|
||||
<file-system> object. OLD-ENTRIES is taken to be a list of menu entries
|
||||
corresponding to old generations of the system."
|
||||
|
||||
(define all-entries
|
||||
(append entries (bootloader-configuration-menu-entries config)))
|
||||
|
||||
(define (boot-parameters->gexp params)
|
||||
(let ((label (boot-parameters-label params))
|
||||
(kernel (boot-parameters-kernel params))
|
||||
(kernel-arguments (boot-parameters-kernel-arguments params))
|
||||
(initrd (boot-parameters-initrd params)))
|
||||
#~(format port "LABEL ~a
|
||||
MENU LABEL ~a
|
||||
KERNEL ~a
|
||||
FDTDIR ~a/lib/dtbs
|
||||
INITRD ~a
|
||||
APPEND ~a
|
||||
~%"
|
||||
#$label #$label
|
||||
#$kernel #$kernel #$initrd
|
||||
(string-join (list #$@kernel-arguments)))))
|
||||
|
||||
(define builder
|
||||
#~(call-with-output-file #$output
|
||||
(lambda (port)
|
||||
(let ((timeout #$(bootloader-configuration-timeout config)))
|
||||
(format port "# This file was generated from your GuixSD configuration. Any changes
|
||||
# will be lost upon reconfiguration.
|
||||
UI menu.c32
|
||||
PROMPT ~a
|
||||
TIMEOUT ~a~%"
|
||||
(if (> timeout 0) 1 0)
|
||||
;; timeout is expressed in 1/10s of seconds.
|
||||
(* 10 timeout))
|
||||
#$@(map boot-parameters->gexp all-entries)
|
||||
|
||||
#$@(if (pair? old-entries)
|
||||
#~((format port "~%")
|
||||
#$@(map boot-parameters->gexp old-entries)
|
||||
(format port "~%"))
|
||||
#~())))))
|
||||
|
||||
(gexp->derivation "extlinux.conf" builder))
|
||||
|
||||
|
||||
|
||||
|
||||
;;;
|
||||
;;; Install procedures.
|
||||
;;;
|
||||
|
||||
(define dd
|
||||
#~(lambda (bs count if of)
|
||||
(zero? (system* "dd"
|
||||
(string-append "bs=" (number->string bs))
|
||||
(string-append "count=" (number->string count))
|
||||
(string-append "if=" if)
|
||||
(string-append "of=" of)))))
|
||||
|
||||
(define install-extlinux
|
||||
#~(lambda (bootloader device mount-point)
|
||||
(let ((extlinux (string-append bootloader "/sbin/extlinux"))
|
||||
(install-dir (string-append mount-point "/boot/extlinux"))
|
||||
(syslinux-dir (string-append bootloader "/share/syslinux")))
|
||||
(for-each (lambda (file)
|
||||
(install-file file install-dir))
|
||||
(find-files syslinux-dir "\\.c32$"))
|
||||
|
||||
(unless (and (zero? (system* extlinux "--install" install-dir))
|
||||
(#$dd 440 1 (string-append syslinux-dir "/mbr.bin") device))
|
||||
(error "failed to install SYSLINUX")))))
|
||||
|
||||
|
||||
|
||||
;;;
|
||||
;;; Bootloader definitions.
|
||||
;;;
|
||||
|
||||
(define extlinux-bootloader
|
||||
(bootloader
|
||||
(name 'extlinux)
|
||||
(package syslinux)
|
||||
(installer install-extlinux)
|
||||
(configuration-file "/boot/extlinux/extlinux.conf")
|
||||
(configuration-file-generator extlinux-configuration-file)))
|
|
@ -1,6 +1,8 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -17,7 +19,7 @@
|
|||
;;; 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 system grub)
|
||||
(define-module (gnu bootloader grub)
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix derivations)
|
||||
|
@ -26,6 +28,8 @@
|
|||
#:use-module (guix gexp)
|
||||
#:use-module (guix download)
|
||||
#:use-module (gnu artwork)
|
||||
#:use-module (gnu system)
|
||||
#:use-module (gnu bootloader)
|
||||
#:use-module (gnu system file-systems)
|
||||
#:autoload (gnu packages bootloaders) (grub)
|
||||
#:autoload (gnu packages compression) (gzip)
|
||||
|
@ -48,15 +52,10 @@
|
|||
%background-image
|
||||
%default-theme
|
||||
|
||||
grub-configuration
|
||||
grub-configuration?
|
||||
grub-configuration-device
|
||||
grub-configuration-grub
|
||||
grub-bootloader
|
||||
grub-efi-bootloader
|
||||
|
||||
menu-entry
|
||||
menu-entry?
|
||||
|
||||
grub-configuration-file))
|
||||
grub-configuration))
|
||||
|
||||
;;; Commentary:
|
||||
;;;
|
||||
|
@ -104,21 +103,6 @@ denoting a file name."
|
|||
(color-highlight '((fg . yellow) (bg . black)))
|
||||
(color-normal '((fg . light-gray) (bg . black))))) ;XXX: #x303030
|
||||
|
||||
(define-record-type* <grub-configuration>
|
||||
grub-configuration make-grub-configuration
|
||||
grub-configuration?
|
||||
(grub grub-configuration-grub ; package
|
||||
(default (@ (gnu packages bootloaders) grub)))
|
||||
(device grub-configuration-device) ; string
|
||||
(menu-entries grub-configuration-menu-entries ; list
|
||||
(default '()))
|
||||
(default-entry grub-configuration-default-entry ; integer
|
||||
(default 0))
|
||||
(timeout grub-configuration-timeout ; integer
|
||||
(default 5))
|
||||
(theme grub-configuration-theme ; <grub-theme>
|
||||
(default %default-theme)))
|
||||
|
||||
(define-record-type* <menu-entry>
|
||||
menu-entry make-menu-entry
|
||||
menu-entry?
|
||||
|
@ -137,21 +121,26 @@ denoting a file name."
|
|||
;;; Background image & themes.
|
||||
;;;
|
||||
|
||||
(define (bootloader-theme config)
|
||||
"Return user defined theme in CONFIG if defined or %default-theme
|
||||
otherwise."
|
||||
(or (bootloader-configuration-theme config) %default-theme))
|
||||
|
||||
(define* (svg->png svg #:key width height)
|
||||
"Build a PNG of HEIGHT x WIDTH from SVG."
|
||||
(gexp->derivation "grub-image.png"
|
||||
(with-imported-modules '((gnu build svg))
|
||||
#~(begin
|
||||
;; We need these two libraries.
|
||||
(add-to-load-path (string-append #$guile-rsvg
|
||||
(add-to-load-path (string-append #+guile-rsvg
|
||||
"/share/guile/site/"
|
||||
(effective-version)))
|
||||
(add-to-load-path (string-append #$guile-cairo
|
||||
(add-to-load-path (string-append #+guile-cairo
|
||||
"/share/guile/site/"
|
||||
(effective-version)))
|
||||
|
||||
(use-modules (gnu build svg))
|
||||
(svg->png #$svg #$output
|
||||
(svg->png #+svg #$output
|
||||
#:width #$width
|
||||
#:height #$height)))))
|
||||
|
||||
|
@ -161,7 +150,8 @@ WIDTH/HEIGHT, or #f if none was found."
|
|||
(let* ((ratio (/ width height))
|
||||
(image (find (lambda (image)
|
||||
(= (grub-image-aspect-ratio image) ratio))
|
||||
(grub-theme-images (grub-configuration-theme config)))))
|
||||
(grub-theme-images
|
||||
(bootloader-theme config)))))
|
||||
(if image
|
||||
(svg->png (grub-image-file image)
|
||||
#:width width #:height height)
|
||||
|
@ -198,13 +188,18 @@ system string---e.g., \"x86_64-linux\"."
|
|||
insmod vbe
|
||||
insmod vga
|
||||
fi
|
||||
|
||||
terminal_output gfxterm
|
||||
"
|
||||
""))
|
||||
|
||||
(define (setup-gfxterm config font-file)
|
||||
(if (memq 'gfxterm (bootloader-configuration-terminal-outputs config))
|
||||
#~(format #f "if loadfont ~a; then
|
||||
setup_gfxterm
|
||||
fi~%" #$font-file)
|
||||
""))
|
||||
|
||||
(define (theme-colors type)
|
||||
(let* ((theme (grub-configuration-theme config))
|
||||
(let* ((theme (bootloader-theme config))
|
||||
(colors (type theme)))
|
||||
(string-append (symbol->string (assoc-ref colors 'fg)) "/"
|
||||
(symbol->string (assoc-ref colors 'bg)))))
|
||||
|
@ -221,9 +216,8 @@ function setup_gfxterm {~a}
|
|||
# Set 'root' to the partition that contains /gnu/store.
|
||||
~a
|
||||
|
||||
if loadfont ~a; then
|
||||
setup_gfxterm
|
||||
fi
|
||||
~a
|
||||
~a
|
||||
|
||||
insmod png
|
||||
if background_image ~a; then
|
||||
|
@ -235,7 +229,8 @@ else
|
|||
fi~%"
|
||||
#$setup-gfxterm-body
|
||||
#$(grub-root-search store-device font-file)
|
||||
#$font-file
|
||||
#$(setup-gfxterm config font-file)
|
||||
#$(grub-setup-io config)
|
||||
|
||||
#$(strip-mount-point store-mount-point image)
|
||||
#$(theme-colors grub-theme-color-normal)
|
||||
|
@ -246,6 +241,57 @@ fi~%"
|
|||
;;; Configuration file.
|
||||
;;;
|
||||
|
||||
(define (grub-setup-io config)
|
||||
"Return GRUB commands to configure the input / output interfaces. The result
|
||||
is a string that can be inserted in grub.cfg."
|
||||
(let* ((symbols->string (lambda (list)
|
||||
(string-join (map symbol->string list) " ")))
|
||||
(outputs (bootloader-configuration-terminal-outputs config))
|
||||
(inputs (bootloader-configuration-terminal-inputs config))
|
||||
(unit (bootloader-configuration-serial-unit config))
|
||||
(speed (bootloader-configuration-serial-speed config))
|
||||
|
||||
;; Respectively, GRUB_TERMINAL_OUTPUT and GRUB_TERMINAL_INPUT,
|
||||
;; as documented in GRUB manual section "Simple Configuration
|
||||
;; Handling".
|
||||
(valid-outputs '(console serial serial_0 serial_1 serial_2 serial_3
|
||||
gfxterm vga_text mda_text morse spkmodem))
|
||||
(valid-inputs '(console serial serial_0 serial_1 serial_2 serial_3
|
||||
at_keyboard usb_keyboard))
|
||||
|
||||
(io (string-append
|
||||
"terminal_output "
|
||||
(symbols->string
|
||||
(map
|
||||
(lambda (output)
|
||||
(if (memq output valid-outputs) output #f)) outputs)) "\n"
|
||||
(if (null? inputs)
|
||||
""
|
||||
(string-append
|
||||
"terminal_input "
|
||||
(symbols->string
|
||||
(map
|
||||
(lambda (input)
|
||||
(if (memq input valid-inputs) input #f)) inputs)) "\n"))
|
||||
;; UNIT and SPEED are arguments to the same GRUB command
|
||||
;; ("serial"), so we process them together.
|
||||
(if (or unit speed)
|
||||
(string-append
|
||||
"serial"
|
||||
(if unit
|
||||
;; COM ports 1 through 4
|
||||
(if (and (exact-integer? unit) (<= unit 3) (>= unit 0))
|
||||
(string-append " --unit=" (number->string unit))
|
||||
#f)
|
||||
"")
|
||||
(if speed
|
||||
(if (exact-integer? speed)
|
||||
(string-append " --speed=" (number->string speed))
|
||||
#f)
|
||||
""))
|
||||
""))))
|
||||
(format #f "~a" io)))
|
||||
|
||||
(define (grub-root-search device file)
|
||||
"Return the GRUB 'search' command to look for DEVICE, which contains FILE,
|
||||
a gexp. The result is a gexp that can be inserted in the grub.cfg-generation
|
||||
|
@ -266,16 +312,28 @@ code."
|
|||
(#f
|
||||
#~(format #f "search --file --set ~a" #$file)))))
|
||||
|
||||
(define (boot-parameters->menu-entry conf)
|
||||
"Convert a <boot-parameters> instance to a corresponding <menu-entry>."
|
||||
(menu-entry
|
||||
(label (boot-parameters-label conf))
|
||||
(device (boot-parameters-store-device conf))
|
||||
(device-mount-point (boot-parameters-store-mount-point conf))
|
||||
(linux (boot-parameters-kernel conf))
|
||||
(linux-arguments (boot-parameters-kernel-arguments conf))
|
||||
(initrd (boot-parameters-initrd conf))))
|
||||
|
||||
(define* (grub-configuration-file config entries
|
||||
#:key
|
||||
(system (%current-system))
|
||||
(old-entries '()))
|
||||
"Return the GRUB configuration file corresponding to CONFIG, a
|
||||
<grub-configuration> object, and where the store is available at STORE-FS, a
|
||||
<file-system> object. OLD-ENTRIES is taken to be a list of menu entries
|
||||
corresponding to old generations of the system."
|
||||
<bootloader-configuration> object, and where the store is available at
|
||||
STORE-FS, a <file-system> object. OLD-ENTRIES is taken to be a list of menu
|
||||
entries corresponding to old generations of the system."
|
||||
(define all-entries
|
||||
(append entries (grub-configuration-menu-entries config)))
|
||||
(map boot-parameters->menu-entry
|
||||
(append entries
|
||||
(bootloader-configuration-menu-entries config))))
|
||||
|
||||
(define entry->gexp
|
||||
(match-lambda
|
||||
|
@ -298,9 +356,9 @@ corresponding to old generations of the system."
|
|||
#$initrd)))))
|
||||
|
||||
(mlet %store-monad ((sugar (eye-candy config
|
||||
(menu-entry-device (first entries))
|
||||
(menu-entry-device (first all-entries))
|
||||
(menu-entry-device-mount-point
|
||||
(first entries))
|
||||
(first all-entries))
|
||||
#:system system
|
||||
#:port #~port)))
|
||||
(define builder
|
||||
|
@ -314,17 +372,77 @@ corresponding to old generations of the system."
|
|||
(format port "
|
||||
set default=~a
|
||||
set timeout=~a~%"
|
||||
#$(grub-configuration-default-entry config)
|
||||
#$(grub-configuration-timeout config))
|
||||
#$(bootloader-configuration-default-entry config)
|
||||
#$(bootloader-configuration-timeout config))
|
||||
#$@(map entry->gexp all-entries)
|
||||
|
||||
#$@(if (pair? old-entries)
|
||||
#~((format port "
|
||||
submenu \"GNU system, old configurations...\" {~%")
|
||||
#$@(map entry->gexp old-entries)
|
||||
#$@(map entry->gexp (map boot-parameters->menu-entry old-entries))
|
||||
(format port "}~%"))
|
||||
#~()))))
|
||||
|
||||
(gexp->derivation "grub.cfg" builder)))
|
||||
|
||||
|
||||
|
||||
;;;
|
||||
;;; Install procedures.
|
||||
;;;
|
||||
|
||||
(define install-grub
|
||||
#~(lambda (bootloader device mount-point)
|
||||
;; Install GRUB on DEVICE which is mounted at MOUNT-POINT.
|
||||
(let ((grub (string-append bootloader "/sbin/grub-install"))
|
||||
(install-dir (string-append mount-point "/boot")))
|
||||
;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or
|
||||
;; root partition.
|
||||
(setenv "GRUB_ENABLE_CRYPTODISK" "y")
|
||||
|
||||
(unless (zero? (system* grub "--no-floppy"
|
||||
"--boot-directory" install-dir
|
||||
device))
|
||||
(error "failed to install GRUB")))))
|
||||
|
||||
|
||||
|
||||
;;;
|
||||
;;; Bootloader definitions.
|
||||
;;;
|
||||
|
||||
(define grub-bootloader
|
||||
(bootloader
|
||||
(name 'grub)
|
||||
(package grub)
|
||||
(installer install-grub)
|
||||
(configuration-file "/boot/grub/grub.cfg")
|
||||
(configuration-file-generator grub-configuration-file)))
|
||||
|
||||
(define* grub-efi-bootloader
|
||||
(bootloader
|
||||
(inherit grub-bootloader)
|
||||
(name 'grub-efi)
|
||||
(package grub-efi)))
|
||||
|
||||
|
||||
;;;
|
||||
;;; Compatibility macros.
|
||||
;;;
|
||||
|
||||
(define-syntax grub-configuration
|
||||
(syntax-rules (grub)
|
||||
((_ (grub package) fields ...)
|
||||
(if (eq? package grub)
|
||||
(bootloader-configuration
|
||||
(bootloader grub-bootloader)
|
||||
fields ...)
|
||||
(bootloader-configuration
|
||||
(bootloader grub-efi-bootloader)
|
||||
fields ...)))
|
||||
((_ fields ...)
|
||||
(bootloader-configuration
|
||||
(bootloader grub-bootloader)
|
||||
fields ...))))
|
||||
|
||||
;;; grub.scm ends here
|
|
@ -227,7 +227,11 @@ numeric gid or #f."
|
|||
#:supplementary-groups supplementary-groups
|
||||
#:comment comment
|
||||
#:home home
|
||||
|
||||
;; Home directories of non-system accounts are created by
|
||||
;; 'activate-user-home'.
|
||||
#:create-home? (and create-home? system?)
|
||||
|
||||
#:shell shell
|
||||
#:password password)
|
||||
|
||||
|
@ -282,7 +286,10 @@ they already exist."
|
|||
(match-lambda
|
||||
((name uid group supplementary-groups comment home create-home?
|
||||
shell password system?)
|
||||
(unless (or (not home) (directory-exists? home))
|
||||
;; The home directories of system accounts are created during
|
||||
;; activation, not here.
|
||||
(unless (or (not home) (not create-home?) system?
|
||||
(directory-exists? home))
|
||||
(let* ((pw (getpwnam name))
|
||||
(uid (passwd:uid pw))
|
||||
(gid (passwd:gid pw)))
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -47,12 +48,7 @@
|
|||
|
||||
mount-flags->bit-mask
|
||||
check-file-system
|
||||
mount-file-system)
|
||||
#:re-export (mount
|
||||
umount
|
||||
MS_BIND
|
||||
MS_MOVE
|
||||
MS_RDONLY))
|
||||
mount-file-system))
|
||||
|
||||
;;; Commentary:
|
||||
;;;
|
||||
|
@ -61,13 +57,6 @@
|
|||
;;;
|
||||
;;; Code:
|
||||
|
||||
;; 'mount' is already defined in the statically linked Guile used for initial
|
||||
;; RAM disks, in which case the bindings in (guix build syscalls) do not work
|
||||
;; (the FFI bindings do not work there). Override them in that case.
|
||||
(when (module-defined? the-scm-module 'mount)
|
||||
(set! mount (@ (guile) mount))
|
||||
(set! umount (@ (guile) umount)))
|
||||
|
||||
(define (bind-mount source target)
|
||||
"Bind-mount SOURCE at TARGET."
|
||||
(mount source target "" MS_BIND))
|
||||
|
@ -239,6 +228,63 @@ Trailing spaces are trimmed."
|
|||
(1 'errors-corrected)
|
||||
(_ 'fatal-error)))
|
||||
|
||||
|
||||
;;;
|
||||
;;; ISO9660 file systems.
|
||||
;;;
|
||||
|
||||
;; <http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-119.pdf>.
|
||||
|
||||
(define (iso9660-superblock? sblock)
|
||||
"Return #t when SBLOCK is a iso9660 superblock."
|
||||
(bytevector=? (sub-bytevector sblock 1 6)
|
||||
;; Note: "\x01" is the volume descriptor format version
|
||||
(string->utf8 "CD001\x01")))
|
||||
|
||||
(define (read-iso9660-primary-volume-descriptor device offset)
|
||||
"Find and read the first primary volume descriptor, starting at OFFSET.
|
||||
Return #f if not found."
|
||||
(let* ((sblock (read-superblock device offset 2048 iso9660-superblock?))
|
||||
(type-code (if sblock (array-ref sblock 0) 255)))
|
||||
(match type-code
|
||||
(255 #f) ; Volume Descriptor Set Terminator.
|
||||
(1 sblock) ; Primary Volume Descriptor
|
||||
(_ (read-iso9660-primary-volume-descriptor device (+ offset 2048))))))
|
||||
|
||||
(define (read-iso9660-superblock device)
|
||||
"Return the raw contents of DEVICE's iso9660 superblock as a bytevector, or
|
||||
#f if DEVICE does not contain a iso9660 file system."
|
||||
;; Start reading at sector 16.
|
||||
(read-iso9660-primary-volume-descriptor device (* 2048 16)))
|
||||
|
||||
(define (iso9660-superblock-uuid sblock)
|
||||
"Return the modification time of a iso9660 superblock SBLOCK as a bytevector."
|
||||
;; Drops GMT offset for compatibility with Grub, blkid and /dev/disk/by-uuid.
|
||||
;; Compare Grub: "2014-12-02-19-30-23-00".
|
||||
;; Compare blkid result: "2014-12-02-19-30-23-00".
|
||||
;; Compare /dev/disk/by-uuid entry: "2014-12-02-19-30-23-00".
|
||||
(sub-bytevector sblock 830 16))
|
||||
|
||||
(define (iso9660-uuid->string uuid)
|
||||
"Given an UUID bytevector, return its timestamp string."
|
||||
(define (digits->string bytes)
|
||||
(latin1->string bytes (lambda (c) #f)))
|
||||
(let* ((year (sub-bytevector uuid 0 4))
|
||||
(month (sub-bytevector uuid 4 2))
|
||||
(day (sub-bytevector uuid 6 2))
|
||||
(hour (sub-bytevector uuid 8 2))
|
||||
(minute (sub-bytevector uuid 10 2))
|
||||
(second (sub-bytevector uuid 12 2))
|
||||
(hundredths (sub-bytevector uuid 14 2))
|
||||
(parts (list year month day hour minute second hundredths)))
|
||||
(string-append (string-join (map digits->string parts)))))
|
||||
|
||||
(define (iso9660-superblock-volume-name sblock)
|
||||
"Return the volume name of SBLOCK as a string. The volume name is an ASCII
|
||||
string. Trailing spaces are trimmed."
|
||||
(string-trim-right (latin1->string (sub-bytevector sblock 40 32)
|
||||
(lambda (c) #f)) #\space))
|
||||
|
||||
|
||||
;;;
|
||||
;;; LUKS encrypted devices.
|
||||
|
@ -351,7 +397,9 @@ partition field reader that returned a value."
|
|||
(_ #f)))
|
||||
|
||||
(define %partition-label-readers
|
||||
(list (partition-field-reader read-ext2-superblock
|
||||
(list (partition-field-reader read-iso9660-superblock
|
||||
iso9660-superblock-volume-name)
|
||||
(partition-field-reader read-ext2-superblock
|
||||
ext2-superblock-volume-name)
|
||||
(partition-field-reader read-btrfs-superblock
|
||||
btrfs-superblock-volume-name)
|
||||
|
@ -359,7 +407,9 @@ partition field reader that returned a value."
|
|||
fat32-superblock-volume-name)))
|
||||
|
||||
(define %partition-uuid-readers
|
||||
(list (partition-field-reader read-ext2-superblock
|
||||
(list (partition-field-reader read-iso9660-superblock
|
||||
iso9660-superblock-uuid)
|
||||
(partition-field-reader read-ext2-superblock
|
||||
ext2-superblock-uuid)
|
||||
(partition-field-reader read-btrfs-superblock
|
||||
btrfs-superblock-uuid)
|
||||
|
@ -576,10 +626,6 @@ corresponds to the symbols listed in FLAGS."
|
|||
(()
|
||||
0))))
|
||||
|
||||
(define (regular-file? file-name)
|
||||
"Return #t if FILE-NAME is a regular file."
|
||||
(eq? (stat:type (stat file-name)) 'regular))
|
||||
|
||||
(define* (mount-file-system spec #:key (root "/root"))
|
||||
"Mount the file system described by SPEC under ROOT. SPEC must have the
|
||||
form:
|
||||
|
@ -619,9 +665,9 @@ run a file system check."
|
|||
(check-file-system source type))
|
||||
|
||||
;; Create the mount point. Most of the time this is a directory, but
|
||||
;; in the case of a bind mount, a regular file may be needed.
|
||||
;; in the case of a bind mount, a regular file or socket may be needed.
|
||||
(if (and (= MS_BIND (logand flags MS_BIND))
|
||||
(regular-file? source))
|
||||
(not (file-is-directory? source)))
|
||||
(unless (file-exists? mount-point)
|
||||
(mkdir-p (dirname mount-point))
|
||||
(call-with-output-file mount-point (const #t)))
|
||||
|
|
|
@ -22,8 +22,7 @@
|
|||
#:use-module (guix build store-copy)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:use-module (ice-9 match)
|
||||
#:export (install-grub
|
||||
install-grub-config
|
||||
#:export (install-boot-config
|
||||
evaluate-populate-directive
|
||||
populate-root-file-system
|
||||
reset-timestamps
|
||||
|
@ -39,36 +38,17 @@
|
|||
;;;
|
||||
;;; Code:
|
||||
|
||||
(define (install-grub grub.cfg device mount-point)
|
||||
"Install GRUB with GRUB.CFG on DEVICE, which is assumed to be mounted on
|
||||
MOUNT-POINT.
|
||||
|
||||
Note that the caller must make sure that GRUB.CFG is registered as a GC root
|
||||
so that the fonts, background images, etc. referred to by GRUB.CFG are not
|
||||
GC'd."
|
||||
(install-grub-config grub.cfg mount-point)
|
||||
|
||||
;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or root
|
||||
;; partition.
|
||||
(setenv "GRUB_ENABLE_CRYPTODISK" "y")
|
||||
|
||||
(unless (zero? (system* "grub-install" "--no-floppy"
|
||||
"--boot-directory"
|
||||
(string-append mount-point "/boot")
|
||||
device))
|
||||
(error "failed to install GRUB")))
|
||||
|
||||
(define (install-grub-config grub.cfg mount-point)
|
||||
"Atomically copy GRUB.CFG into boot/grub/grub.cfg on the MOUNT-POINT. Note
|
||||
that the caller must make sure that GRUB.CFG is registered as a GC root so
|
||||
that the fonts, background images, etc. referred to by GRUB.CFG are not GC'd."
|
||||
(let* ((target (string-append mount-point "/boot/grub/grub.cfg"))
|
||||
(define (install-boot-config bootcfg bootcfg-location mount-point)
|
||||
"Atomically copy BOOTCFG into BOOTCFG-LOCATION on the MOUNT-POINT. Note
|
||||
that the caller must make sure that BOOTCFG is registered as a GC root so
|
||||
that the fonts, background images, etc. referred to by BOOTCFG are not GC'd."
|
||||
(let* ((target (string-append mount-point bootcfg-location))
|
||||
(pivot (string-append target ".new")))
|
||||
(mkdir-p (dirname target))
|
||||
|
||||
;; Copy GRUB.CFG instead of just symlinking it, because symlinks won't
|
||||
;; Copy BOOTCFG instead of just symlinking it, because symlinks won't
|
||||
;; work when /boot is on a separate partition. Do that atomically.
|
||||
(copy-file grub.cfg pivot)
|
||||
(copy-file bootcfg pivot)
|
||||
(rename-file pivot target)))
|
||||
|
||||
(define (evaluate-populate-directive directive target)
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -26,6 +27,7 @@
|
|||
#:use-module (ice-9 match)
|
||||
#:use-module (ice-9 ftw)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (guix build syscalls)
|
||||
#:use-module (gnu build linux-modules)
|
||||
#:use-module (gnu build file-systems)
|
||||
#:export (mount-essential-file-systems
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -18,6 +19,7 @@
|
|||
|
||||
(define-module (gnu build linux-modules)
|
||||
#:use-module (guix elf)
|
||||
#:use-module (guix build syscalls)
|
||||
#:use-module (rnrs io ports)
|
||||
#:use-module (rnrs bytevectors)
|
||||
#:use-module (srfi srfi-1)
|
||||
|
|
131
gnu/build/vm.scm
131
gnu/build/vm.scm
|
@ -2,6 +2,8 @@
|
|||
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
|
||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -21,9 +23,11 @@
|
|||
(define-module (gnu build vm)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (guix build store-copy)
|
||||
#:use-module (guix build syscalls)
|
||||
#:use-module (gnu build linux-boot)
|
||||
#:use-module (gnu build install)
|
||||
#:use-module (guix records)
|
||||
#:use-module (ice-9 format)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (ice-9 regex)
|
||||
#:use-module (srfi srfi-1)
|
||||
|
@ -39,7 +43,7 @@
|
|||
partition-size
|
||||
partition-file-system
|
||||
partition-label
|
||||
partition-bootable?
|
||||
partition-flags
|
||||
partition-initializer
|
||||
|
||||
root-partition-initializer
|
||||
|
@ -139,7 +143,7 @@ the #:references-graphs parameter of 'derivation'."
|
|||
(size partition-size)
|
||||
(file-system partition-file-system (default "ext4"))
|
||||
(label partition-label (default #f))
|
||||
(bootable? partition-bootable? (default #f))
|
||||
(flags partition-flags (default '()))
|
||||
(initializer partition-initializer (default (const #t))))
|
||||
|
||||
(define (fold2 proc seed1 seed2 lst) ;TODO: factorize
|
||||
|
@ -166,9 +170,10 @@ actual /dev name based on DEVICE."
|
|||
(cons* "mkpart" "primary" "ext2"
|
||||
(format #f "~aB" offset)
|
||||
(format #f "~aB" (+ offset (partition-size part)))
|
||||
(if (partition-bootable? part)
|
||||
`("set" ,(number->string index) "boot" "on")
|
||||
'())))
|
||||
(append-map (lambda (flag)
|
||||
(list "set" (number->string index)
|
||||
(symbol->string flag) "on"))
|
||||
(partition-flags part))))
|
||||
|
||||
(define (options partitions offset)
|
||||
(let loop ((partitions partitions)
|
||||
|
@ -209,10 +214,10 @@ actual /dev name based on DEVICE."
|
|||
|
||||
(define MS_BIND 4096) ; <sys/mounts.h> again!
|
||||
|
||||
(define* (format-partition partition type
|
||||
#:key label)
|
||||
"Create a file system TYPE on PARTITION. If LABEL is true, use that as the
|
||||
volume name."
|
||||
(define* (create-ext-file-system partition type
|
||||
#:key label)
|
||||
"Create an ext-family filesystem of TYPE on PARTITION. If LABEL is true,
|
||||
use that as the volume name."
|
||||
(format #t "creating ~a partition...\n" type)
|
||||
(unless (zero? (apply system* (string-append "mkfs." type)
|
||||
"-F" partition
|
||||
|
@ -221,6 +226,28 @@ volume name."
|
|||
'())))
|
||||
(error "failed to create partition")))
|
||||
|
||||
(define* (create-fat-file-system partition
|
||||
#:key label)
|
||||
"Create a FAT filesystem on PARTITION. The number of File Allocation Tables
|
||||
will be determined based on filesystem size. If LABEL is true, use that as the
|
||||
volume name."
|
||||
(format #t "creating FAT partition...\n")
|
||||
(unless (zero? (apply system* "mkfs.fat" partition
|
||||
(if label
|
||||
`("-n" ,label)
|
||||
'())))
|
||||
(error "failed to create FAT partition")))
|
||||
|
||||
(define* (format-partition partition type
|
||||
#:key label)
|
||||
"Create a file system TYPE on PARTITION. If LABEL is true, use that as the
|
||||
volume name."
|
||||
(cond ((string-prefix? "ext" type)
|
||||
(create-ext-file-system partition type #:label label))
|
||||
((or (string-prefix? "fat" type) (string= "vfat" type))
|
||||
(create-fat-file-system partition #:label label))
|
||||
(else (error "Unsupported file system."))))
|
||||
|
||||
(define (initialize-partition partition)
|
||||
"Format PARTITION, a <partition> object with a non-#f 'device' field, mount
|
||||
it, run its initializer, and unmount it."
|
||||
|
@ -283,23 +310,65 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation."
|
|||
(unless register-closures?
|
||||
(reset-timestamps target))))
|
||||
|
||||
(define (register-grub.cfg-root target grub.cfg)
|
||||
"On file system TARGET, register GRUB.CFG as a GC root."
|
||||
(define (register-bootcfg-root target bootcfg)
|
||||
"On file system TARGET, register BOOTCFG as a GC root."
|
||||
(let ((directory (string-append target "/var/guix/gcroots")))
|
||||
(mkdir-p directory)
|
||||
(symlink grub.cfg (string-append directory "/grub.cfg"))))
|
||||
(symlink bootcfg (string-append directory "/bootcfg"))))
|
||||
|
||||
(define (install-efi grub esp config-file)
|
||||
"Write a self-contained GRUB EFI loader to the mounted ESP using CONFIG-FILE."
|
||||
(let* ((system %host-type)
|
||||
;; Hard code the output location to a well-known path recognized by
|
||||
;; compliant firmware. See "3.5.1.1 Removable Media Boot Behaviour":
|
||||
;; http://www.uefi.org/sites/default/files/resources/UEFI%20Spec%202_6.pdf
|
||||
(grub-mkstandalone (string-append grub "/bin/grub-mkstandalone"))
|
||||
(efi-directory (string-append esp "/EFI/BOOT"))
|
||||
;; Map grub target names to boot file names.
|
||||
(efi-targets (cond ((string-prefix? "x86_64" system)
|
||||
'("x86_64-efi" . "BOOTX64.EFI"))
|
||||
((string-prefix? "i686" system)
|
||||
'("i386-efi" . "BOOTIA32.EFI"))
|
||||
((string-prefix? "armhf" system)
|
||||
'("arm-efi" . "BOOTARM.EFI"))
|
||||
((string-prefix? "aarch64" system)
|
||||
'("arm64-efi" . "BOOTAA64.EFI")))))
|
||||
;; grub-mkstandalone requires a TMPDIR to prepare the firmware image.
|
||||
(setenv "TMPDIR" esp)
|
||||
|
||||
(mkdir-p efi-directory)
|
||||
(unless (zero? (system* grub-mkstandalone "-O" (car efi-targets)
|
||||
"-o" (string-append efi-directory "/"
|
||||
(cdr efi-targets))
|
||||
;; Graft the configuration file onto the image.
|
||||
(string-append "boot/grub/grub.cfg=" config-file)))
|
||||
(error "failed to create GRUB EFI image"))))
|
||||
|
||||
(define* (initialize-hard-disk device
|
||||
#:key
|
||||
grub.cfg
|
||||
bootloader-package
|
||||
bootcfg
|
||||
bootcfg-location
|
||||
bootloader-installer
|
||||
(grub-efi #f)
|
||||
(partitions '()))
|
||||
"Initialize DEVICE as a disk containing all the <partition> objects listed
|
||||
in PARTITIONS, and using GRUB.CFG as its bootloader configuration file.
|
||||
in PARTITIONS, and using BOOTCFG as its bootloader configuration file.
|
||||
|
||||
Each partition is initialized by calling its 'initializer' procedure,
|
||||
passing it a directory name where it is mounted."
|
||||
|
||||
(define (partition-bootable? partition)
|
||||
"Return the first partition found with the boot flag set."
|
||||
(member 'boot (partition-flags partition)))
|
||||
|
||||
(define (partition-esp? partition)
|
||||
"Return the first EFI System Partition."
|
||||
(member 'esp (partition-flags partition)))
|
||||
|
||||
(let* ((partitions (initialize-partition-table device partitions))
|
||||
(root (find partition-bootable? partitions))
|
||||
(esp (find partition-esp? partitions))
|
||||
(target "/fs"))
|
||||
(unless root
|
||||
(error "no bootable partition specified" partitions))
|
||||
|
@ -309,10 +378,38 @@ passing it a directory name where it is mounted."
|
|||
(display "mounting root partition...\n")
|
||||
(mkdir-p target)
|
||||
(mount (partition-device root) target (partition-file-system root))
|
||||
(install-grub grub.cfg device target)
|
||||
(install-boot-config bootcfg bootcfg-location target)
|
||||
(when bootloader-installer
|
||||
(display "installing bootloader...\n")
|
||||
(bootloader-installer bootloader-package device target))
|
||||
|
||||
;; Register GRUB.CFG as a GC root.
|
||||
(register-grub.cfg-root target grub.cfg)
|
||||
(when esp
|
||||
;; Mount the ESP somewhere and install GRUB UEFI image.
|
||||
(let ((mount-point (string-append target "/boot/efi"))
|
||||
(grub-config (string-append target "/tmp/grub-standalone.cfg")))
|
||||
(display "mounting EFI system partition...\n")
|
||||
(mkdir-p mount-point)
|
||||
(mount (partition-device esp) mount-point
|
||||
(partition-file-system esp))
|
||||
|
||||
;; Create a tiny configuration file telling the embedded grub
|
||||
;; where to load the real thing.
|
||||
(call-with-output-file grub-config
|
||||
(lambda (port)
|
||||
(format port
|
||||
"insmod part_msdos~@
|
||||
search --set=root --label gnu-disk-image~@
|
||||
configfile /boot/grub/grub.cfg~%")))
|
||||
|
||||
(display "creating EFI firmware image...")
|
||||
(install-efi grub-efi mount-point grub-config)
|
||||
(display "done.\n")
|
||||
|
||||
(delete-file grub-config)
|
||||
(umount mount-point)))
|
||||
|
||||
;; Register BOOTCFG as a GC root.
|
||||
(register-bootcfg-root target bootcfg)
|
||||
|
||||
(umount target)))
|
||||
|
||||
|
|
146
gnu/local.mk
146
gnu/local.mk
|
@ -36,6 +36,9 @@
|
|||
GNU_SYSTEM_MODULES = \
|
||||
gnu.scm \
|
||||
%D%/artwork.scm \
|
||||
%D%/bootloader.scm \
|
||||
%D%/bootloader/grub.scm \
|
||||
%D%/bootloader/extlinux.scm \
|
||||
%D%/packages.scm \
|
||||
%D%/packages/abduco.scm \
|
||||
%D%/packages/abiword.scm \
|
||||
|
@ -45,6 +48,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/adns.scm \
|
||||
%D%/packages/algebra.scm \
|
||||
%D%/packages/aidc.scm \
|
||||
%D%/packages/android.scm \
|
||||
%D%/packages/animation.scm \
|
||||
%D%/packages/anthy.scm \
|
||||
%D%/packages/apl.scm \
|
||||
|
@ -53,7 +57,6 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/assembly.scm \
|
||||
%D%/packages/astronomy.scm \
|
||||
%D%/packages/attr.scm \
|
||||
%D%/packages/audacity.scm \
|
||||
%D%/packages/audio.scm \
|
||||
%D%/packages/augeas.scm \
|
||||
%D%/packages/autogen.scm \
|
||||
|
@ -71,6 +74,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/boost.scm \
|
||||
%D%/packages/bootloaders.scm \
|
||||
%D%/packages/bootstrap.scm \
|
||||
%D%/packages/build-tools.scm \
|
||||
%D%/packages/busybox.scm \
|
||||
%D%/packages/c.scm \
|
||||
%D%/packages/calcurse.scm \
|
||||
|
@ -106,7 +110,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/dejagnu.scm \
|
||||
%D%/packages/dico.scm \
|
||||
%D%/packages/dictionaries.scm \
|
||||
%D%/packages/dillo.scm \
|
||||
%D%/packages/direct-connect.scm \
|
||||
%D%/packages/disk.scm \
|
||||
%D%/packages/display-managers.scm \
|
||||
%D%/packages/django.scm \
|
||||
|
@ -193,6 +197,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/idris.scm \
|
||||
%D%/packages/idutils.scm \
|
||||
%D%/packages/image.scm \
|
||||
%D%/packages/image-processing.scm \
|
||||
%D%/packages/image-viewers.scm \
|
||||
%D%/packages/imagemagick.scm \
|
||||
%D%/packages/indent.scm \
|
||||
|
@ -232,7 +237,6 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/libunwind.scm \
|
||||
%D%/packages/libupnp.scm \
|
||||
%D%/packages/lighting.scm \
|
||||
%D%/packages/links.scm \
|
||||
%D%/packages/linux.scm \
|
||||
%D%/packages/lirc.scm \
|
||||
%D%/packages/lisp.scm \
|
||||
|
@ -244,7 +248,6 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/lua.scm \
|
||||
%D%/packages/lxde.scm \
|
||||
%D%/packages/lxqt.scm \
|
||||
%D%/packages/lynx.scm \
|
||||
%D%/packages/m4.scm \
|
||||
%D%/packages/machine-learning.scm \
|
||||
%D%/packages/man.scm \
|
||||
|
@ -256,6 +259,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/maths.scm \
|
||||
%D%/packages/mc.scm \
|
||||
%D%/packages/mcrypt.scm \
|
||||
%D%/packages/mes.scm \
|
||||
%D%/packages/messaging.scm \
|
||||
%D%/packages/mingw.scm \
|
||||
%D%/packages/mg.scm \
|
||||
|
@ -343,6 +347,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/sdl.scm \
|
||||
%D%/packages/search.scm \
|
||||
%D%/packages/security-token.scm \
|
||||
%D%/packages/selinux.scm \
|
||||
%D%/packages/serialization.scm \
|
||||
%D%/packages/serveez.scm \
|
||||
%D%/packages/shells.scm \
|
||||
|
@ -355,6 +360,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/speech.scm \
|
||||
%D%/packages/spice.scm \
|
||||
%D%/packages/ssh.scm \
|
||||
%D%/packages/sssd.scm \
|
||||
%D%/packages/stalonetray.scm \
|
||||
%D%/packages/statistics.scm \
|
||||
%D%/packages/storage.scm \
|
||||
|
@ -390,6 +396,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/w3m.scm \
|
||||
%D%/packages/wdiff.scm \
|
||||
%D%/packages/web.scm \
|
||||
%D%/packages/web-browsers.scm \
|
||||
%D%/packages/webkit.scm \
|
||||
%D%/packages/wget.scm \
|
||||
%D%/packages/wicd.scm \
|
||||
|
@ -439,7 +446,6 @@ GNU_SYSTEM_MODULES = \
|
|||
\
|
||||
%D%/system.scm \
|
||||
%D%/system/file-systems.scm \
|
||||
%D%/system/grub.scm \
|
||||
%D%/system/install.scm \
|
||||
%D%/system/linux-container.scm \
|
||||
%D%/system/linux-initrd.scm \
|
||||
|
@ -460,7 +466,6 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/build/linux-modules.scm \
|
||||
%D%/build/marionette.scm \
|
||||
%D%/build/shepherd.scm \
|
||||
%D%/build/svg.scm \
|
||||
%D%/build/vm.scm \
|
||||
\
|
||||
%D%/tests.scm \
|
||||
|
@ -474,6 +479,9 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/tests/ssh.scm \
|
||||
%D%/tests/web.scm
|
||||
|
||||
# Modules that do not need to be compiled.
|
||||
MODULES_NOT_COMPILED += \
|
||||
%D%/build/svg.scm
|
||||
|
||||
patchdir = $(guilemoduledir)/%D%/packages/patches
|
||||
dist_patch_DATA = \
|
||||
|
@ -482,6 +490,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/a2ps-CVE-2014-0466.patch \
|
||||
%D%/packages/patches/abiword-explictly-cast-bools.patch \
|
||||
%D%/packages/patches/abiword-wmf-version-lookup-fix.patch \
|
||||
%D%/packages/patches/abiword-black-drawing-with-gtk322.patch \
|
||||
%D%/packages/patches/acl-hurd-path-max.patch \
|
||||
%D%/packages/patches/aegis-constness-error.patch \
|
||||
%D%/packages/patches/aegis-perl-tempdir1.patch \
|
||||
|
@ -492,10 +501,10 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/antiword-CVE-2014-8123.patch \
|
||||
%D%/packages/patches/apr-skip-getservbyname-test.patch \
|
||||
%D%/packages/patches/artanis-fix-Makefile.in.patch \
|
||||
%D%/packages/patches/aspell-default-dict-dir.patch \
|
||||
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
|
||||
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
|
||||
%D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
|
||||
%D%/packages/patches/audacity-fix-ffmpeg-binding.patch \
|
||||
%D%/packages/patches/automake-skip-amhello-tests.patch \
|
||||
%D%/packages/patches/automake-regexp-syntax.patch \
|
||||
%D%/packages/patches/automake-test-gzip-warning.patch \
|
||||
|
@ -511,9 +520,13 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/byobu-writable-status.patch \
|
||||
%D%/packages/patches/cairo-CVE-2016-9082.patch \
|
||||
%D%/packages/patches/calibre-drop-unrar.patch \
|
||||
%D%/packages/patches/calibre-dont-load-remote-icons.patch \
|
||||
%D%/packages/patches/calibre-no-updates-dialog.patch \
|
||||
%D%/packages/patches/calibre-use-packaged-feedparser.patch \
|
||||
%D%/packages/patches/cdparanoia-fpic.patch \
|
||||
%D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \
|
||||
%D%/packages/patches/ceph-disable-cpu-optimizations.patch \
|
||||
%D%/packages/patches/ceph-disable-unittest-throttle.patch \
|
||||
%D%/packages/patches/ceph-skip-collect-sys-info-test.patch \
|
||||
%D%/packages/patches/ceph-skip-unittest_blockdev.patch \
|
||||
%D%/packages/patches/chicken-CVE-2017-6949.patch \
|
||||
|
@ -524,6 +537,10 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/clx-remove-demo.patch \
|
||||
%D%/packages/patches/cmake-fix-tests.patch \
|
||||
%D%/packages/patches/coda-use-system-libs.patch \
|
||||
%D%/packages/patches/cool-retro-term-dont-check-uninit-member.patch \
|
||||
%D%/packages/patches/cool-retro-term-fix-array-size.patch \
|
||||
%D%/packages/patches/cool-retro-term-memory-leak-1.patch \
|
||||
%D%/packages/patches/cool-retro-term-remove-non-free-fonts.patch \
|
||||
%D%/packages/patches/coreutils-cut-huge-range-test.patch \
|
||||
%D%/packages/patches/cpio-CVE-2016-2037.patch \
|
||||
%D%/packages/patches/cpufrequtils-fix-aclocal.patch \
|
||||
|
@ -541,6 +558,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/doc++-include-directives.patch \
|
||||
%D%/packages/patches/doc++-segfault-fix.patch \
|
||||
%D%/packages/patches/doxygen-test.patch \
|
||||
%D%/packages/patches/dvd+rw-tools-add-include.patch \
|
||||
%D%/packages/patches/elfutils-tests-ptrace.patch \
|
||||
%D%/packages/patches/elixir-disable-failing-tests.patch \
|
||||
%D%/packages/patches/einstein-build.patch \
|
||||
|
@ -552,6 +570,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/eudev-conflicting-declaration.patch \
|
||||
%D%/packages/patches/evilwm-lost-focus-bug.patch \
|
||||
%D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch \
|
||||
%D%/packages/patches/fabric-tests.patch \
|
||||
%D%/packages/patches/fastcap-mulGlobal.patch \
|
||||
%D%/packages/patches/fastcap-mulSetup.patch \
|
||||
%D%/packages/patches/fasthenry-spAllocate.patch \
|
||||
|
@ -573,11 +592,11 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/freeimage-CVE-2015-0852.patch \
|
||||
%D%/packages/patches/freeimage-CVE-2016-5684.patch \
|
||||
%D%/packages/patches/freeimage-fix-build-with-gcc-5.patch \
|
||||
%D%/packages/patches/fuse-overlapping-headers.patch \
|
||||
%D%/packages/patches/gawk-shell.patch \
|
||||
%D%/packages/patches/gcc-arm-bug-71399.patch \
|
||||
%D%/packages/patches/gcc-arm-link-spec-fix.patch \
|
||||
%D%/packages/patches/gcc-cross-environment-variables.patch \
|
||||
%D%/packages/patches/gcc-libiberty-printf-decl.patch \
|
||||
%D%/packages/patches/gcc-libvtv-runpath.patch \
|
||||
%D%/packages/patches/gcc-strmov-store-file-names.patch \
|
||||
%D%/packages/patches/gcc-4.9.3-mingw-gthr-default.patch \
|
||||
|
@ -586,7 +605,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/gcc-5-source-date-epoch-2.patch \
|
||||
%D%/packages/patches/gcc-6-arm-none-eabi-multilib.patch \
|
||||
%D%/packages/patches/gcc-6-cross-environment-variables.patch \
|
||||
%D%/packages/patches/gcj-arm-mode.patch \
|
||||
%D%/packages/patches/gdk-pixbuf-list-dir.patch \
|
||||
%D%/packages/patches/gd-fix-gd2-read-test.patch \
|
||||
%D%/packages/patches/gd-fix-tests-on-i686.patch \
|
||||
|
@ -603,36 +621,42 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/ghostscript-CVE-2016-7978.patch \
|
||||
%D%/packages/patches/ghostscript-CVE-2016-7979.patch \
|
||||
%D%/packages/patches/ghostscript-CVE-2016-8602.patch \
|
||||
%D%/packages/patches/ghostscript-CVE-2017-8291.patch \
|
||||
%D%/packages/patches/ghostscript-runpath.patch \
|
||||
%D%/packages/patches/glib-networking-ssl-cert-file.patch \
|
||||
%D%/packages/patches/glib-tests-timer.patch \
|
||||
%D%/packages/patches/glibc-bootstrap-system.patch \
|
||||
%D%/packages/patches/glibc-ldd-x86_64.patch \
|
||||
%D%/packages/patches/glibc-locales.patch \
|
||||
%D%/packages/patches/glibc-memchr-overflow-i686.patch \
|
||||
%D%/packages/patches/glibc-o-largefile.patch \
|
||||
%D%/packages/patches/glibc-versioned-locpath.patch \
|
||||
%D%/packages/patches/glog-gcc-5-demangling.patch \
|
||||
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
|
||||
%D%/packages/patches/gmp-faulty-test.patch \
|
||||
%D%/packages/patches/gnome-shell-CVE-2017-8288.patch \
|
||||
%D%/packages/patches/gnome-tweak-tool-search-paths.patch \
|
||||
%D%/packages/patches/gnucash-price-quotes-perl.patch \
|
||||
%D%/packages/patches/gnupg-2.1-fix-Y2038-test-failure.patch \
|
||||
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
|
||||
%D%/packages/patches/gobject-introspection-cc.patch \
|
||||
%D%/packages/patches/gobject-introspection-girepository.patch \
|
||||
%D%/packages/patches/graphite2-CVE-2017-5436.patch \
|
||||
%D%/packages/patches/graphite2-check-code-point-limit.patch \
|
||||
%D%/packages/patches/graphite2-ffloat-store.patch \
|
||||
%D%/packages/patches/graphite2-fix-32-bit-wrap-arounds.patch \
|
||||
%D%/packages/patches/graphite2-non-linear-classes-even-number.patch \
|
||||
%D%/packages/patches/grep-gnulib-lock.patch \
|
||||
%D%/packages/patches/grep-timing-sensitive-test.patch \
|
||||
%D%/packages/patches/grub-CVE-2015-8370.patch \
|
||||
%D%/packages/patches/grub-gets-undeclared.patch \
|
||||
%D%/packages/patches/grub-freetype.patch \
|
||||
%D%/packages/patches/gsl-test-i686.patch \
|
||||
%D%/packages/patches/gspell-dash-test.patch \
|
||||
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
|
||||
%D%/packages/patches/guile-arm-fixes.patch \
|
||||
%D%/packages/patches/guile-default-utf8.patch \
|
||||
%D%/packages/patches/guile-linux-syscalls.patch \
|
||||
%D%/packages/patches/guile-present-coding.patch \
|
||||
%D%/packages/patches/guile-relocatable.patch \
|
||||
%D%/packages/patches/guile-rsvg-pkgconfig.patch \
|
||||
%D%/packages/patches/guile-ssh-rexec-bug.patch \
|
||||
%D%/packages/patches/guile-ssh-double-free.patch \
|
||||
%D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
|
||||
%D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
|
||||
%D%/packages/patches/gtk2-theme-paths.patch \
|
||||
|
@ -654,23 +678,27 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/higan-remove-march-native-flag.patch \
|
||||
%D%/packages/patches/hop-linker-flags.patch \
|
||||
%D%/packages/patches/hubbub-sort-entities.patch \
|
||||
%D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \
|
||||
%D%/packages/patches/hydra-disable-darcs-test.patch \
|
||||
%D%/packages/patches/hypre-doc-tables.patch \
|
||||
%D%/packages/patches/hypre-ldflags.patch \
|
||||
%D%/packages/patches/icecat-avoid-bundled-libraries.patch \
|
||||
%D%/packages/patches/icecat-binutils.patch \
|
||||
%D%/packages/patches/icu4c-CVE-2014-6585.patch \
|
||||
%D%/packages/patches/icu4c-CVE-2015-1270.patch \
|
||||
%D%/packages/patches/icu4c-CVE-2015-4760.patch \
|
||||
%D%/packages/patches/icu4c-CVE-2017-7867-CVE-2017-7868.patch \
|
||||
%D%/packages/patches/icu4c-reset-keyword-list-iterator.patch \
|
||||
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
|
||||
%D%/packages/patches/ilmbase-fix-tests.patch \
|
||||
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
|
||||
%D%/packages/patches/jasper-CVE-2017-6850.patch \
|
||||
%D%/packages/patches/jbig2dec-ignore-testtest.patch \
|
||||
%D%/packages/patches/jbig2dec-CVE-2016-9601.patch \
|
||||
%D%/packages/patches/jbig2dec-CVE-2017-7885.patch \
|
||||
%D%/packages/patches/jbig2dec-CVE-2017-7975.patch \
|
||||
%D%/packages/patches/jbig2dec-CVE-2017-7976.patch \
|
||||
%D%/packages/patches/jq-CVE-2015-8863.patch \
|
||||
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
|
||||
%D%/packages/patches/khmer-use-libraries.patch \
|
||||
%D%/packages/patches/kio-CVE-2017-6410.patch \
|
||||
%D%/packages/patches/kiki-level-selection-crash.patch \
|
||||
%D%/packages/patches/kiki-makefile.patch \
|
||||
%D%/packages/patches/kiki-missing-includes.patch \
|
||||
%D%/packages/patches/kiki-portability-64bit.patch \
|
||||
%D%/packages/patches/kmod-module-directory.patch \
|
||||
%D%/packages/patches/kobodeluxe-paths.patch \
|
||||
%D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \
|
||||
|
@ -687,8 +715,12 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/liba52-link-with-libm.patch \
|
||||
%D%/packages/patches/liba52-set-soname.patch \
|
||||
%D%/packages/patches/liba52-use-mtune-not-mcpu.patch \
|
||||
%D%/packages/patches/libbase-fix-includes.patch \
|
||||
%D%/packages/patches/libbase-use-own-logging.patch \
|
||||
%D%/packages/patches/libbonobo-activation-test-race.patch \
|
||||
%D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \
|
||||
%D%/packages/patches/libcroco-CVE-2017-7960.patch \
|
||||
%D%/packages/patches/libcroco-CVE-2017-7961.patch \
|
||||
%D%/packages/patches/libdrm-symbol-check.patch \
|
||||
%D%/packages/patches/libetonyek-build-with-mdds-1.2.patch \
|
||||
%D%/packages/patches/libevent-dns-tests.patch \
|
||||
|
@ -710,6 +742,9 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/libmad-armv7-thumb-pt2.patch \
|
||||
%D%/packages/patches/libmad-frame-length.patch \
|
||||
%D%/packages/patches/libmad-mips-newgcc.patch \
|
||||
%D%/packages/patches/libsndfile-armhf-type-checks.patch \
|
||||
%D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \
|
||||
%D%/packages/patches/libsndfile-CVE-2017-8362.patch \
|
||||
%D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch \
|
||||
%D%/packages/patches/libtar-CVE-2013-4420.patch \
|
||||
%D%/packages/patches/libtheora-config-guess.patch \
|
||||
|
@ -717,6 +752,9 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/libtiff-CVE-2016-10093.patch \
|
||||
%D%/packages/patches/libtiff-CVE-2016-10094.patch \
|
||||
%D%/packages/patches/libtiff-CVE-2017-5225.patch \
|
||||
%D%/packages/patches/libtiff-CVE-2017-7593.patch \
|
||||
%D%/packages/patches/libtiff-CVE-2017-7594.patch \
|
||||
%D%/packages/patches/libtiff-multiple-UBSAN-crashes.patch \
|
||||
%D%/packages/patches/libtiff-assertion-failure.patch \
|
||||
%D%/packages/patches/libtiff-divide-by-zero-ojpeg.patch \
|
||||
%D%/packages/patches/libtiff-divide-by-zero-tiffcp.patch \
|
||||
|
@ -729,6 +767,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/libtiff-invalid-read.patch \
|
||||
%D%/packages/patches/libtiff-null-dereference.patch \
|
||||
%D%/packages/patches/libtiff-tiffcp-underflow.patch \
|
||||
%D%/packages/patches/libtirpc-CVE-2017-8779.patch \
|
||||
%D%/packages/patches/libtorrent-rasterbar-boost-compat.patch \
|
||||
%D%/packages/patches/libtool-skip-tests2.patch \
|
||||
%D%/packages/patches/libunwind-CVE-2015-3239.patch \
|
||||
|
@ -752,8 +791,14 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/libxslt-generated-ids.patch \
|
||||
%D%/packages/patches/libxslt-CVE-2016-4738.patch \
|
||||
%D%/packages/patches/libxt-guix-search-paths.patch \
|
||||
%D%/packages/patches/lierolibre-check-unaligned-access.patch \
|
||||
%D%/packages/patches/lierolibre-is-free-software.patch \
|
||||
%D%/packages/patches/lierolibre-newer-libconfig.patch \
|
||||
%D%/packages/patches/lierolibre-remove-arch-warning.patch \
|
||||
%D%/packages/patches/lierolibre-try-building-other-arch.patch \
|
||||
%D%/packages/patches/linux-pam-no-setfsuid.patch \
|
||||
%D%/packages/patches/lirc-localstatedir.patch \
|
||||
%D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \
|
||||
%D%/packages/patches/llvm-for-extempore.patch \
|
||||
%D%/packages/patches/lm-sensors-hwmon-attrs.patch \
|
||||
%D%/packages/patches/lua-CVE-2014-5461.patch \
|
||||
|
@ -764,8 +809,11 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/luajit-no_ldconfig.patch \
|
||||
%D%/packages/patches/luajit-symlinks.patch \
|
||||
%D%/packages/patches/luit-posix.patch \
|
||||
%D%/packages/patches/luminance-hdr-qt-printer.patch \
|
||||
%D%/packages/patches/lvm2-static-link.patch \
|
||||
%D%/packages/patches/lxsession-use-gapplication.patch \
|
||||
%D%/packages/patches/lxterminal-CVE-2016-10369.patch \
|
||||
%D%/packages/patches/lz4-fix-test-failures.patch \
|
||||
%D%/packages/patches/make-impure-dirs.patch \
|
||||
%D%/packages/patches/mars-install.patch \
|
||||
%D%/packages/patches/mars-sfml-2.3.patch \
|
||||
|
@ -774,22 +822,24 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/mcrypt-CVE-2012-4409.patch \
|
||||
%D%/packages/patches/mcrypt-CVE-2012-4426.patch \
|
||||
%D%/packages/patches/mcrypt-CVE-2012-4527.patch \
|
||||
%D%/packages/patches/mesa-fix-32bit-test-failures.patch \
|
||||
%D%/packages/patches/mesa-skip-disk-cache-test.patch \
|
||||
%D%/packages/patches/mesa-wayland-egl-symbols-check-mips.patch \
|
||||
%D%/packages/patches/metabat-remove-compilation-date.patch \
|
||||
%D%/packages/patches/mhash-keygen-test-segfault.patch \
|
||||
%D%/packages/patches/miniupnpc-CVE-2017-8798.patch \
|
||||
%D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch \
|
||||
%D%/packages/patches/mpc123-initialize-ao.patch \
|
||||
%D%/packages/patches/mplayer2-theora-fix.patch \
|
||||
%D%/packages/patches/module-init-tools-moduledir.patch \
|
||||
%D%/packages/patches/mozjs17-aarch64-support.patch \
|
||||
%D%/packages/patches/mozjs24-aarch64-support.patch \
|
||||
%D%/packages/patches/mozjs38-pkg-config-version.patch \
|
||||
%D%/packages/patches/mozjs38-shell-version.patch \
|
||||
%D%/packages/patches/mozjs38-tracelogger.patch \
|
||||
%D%/packages/patches/mozjs38-version-detection.patch \
|
||||
%D%/packages/patches/multiqc-fix-git-subprocess-error.patch \
|
||||
%D%/packages/patches/mumps-build-parallelism.patch \
|
||||
%D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch \
|
||||
%D%/packages/patches/mupdf-mujs-CVE-2016-10132.patch \
|
||||
%D%/packages/patches/mupdf-mujs-CVE-2016-10133.patch \
|
||||
%D%/packages/patches/mupdf-CVE-2017-5896.patch \
|
||||
%D%/packages/patches/mupdf-CVE-2017-5991.patch \
|
||||
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
|
||||
%D%/packages/patches/musl-CVE-2016-8859.patch \
|
||||
%D%/packages/patches/mutt-store-references.patch \
|
||||
|
@ -802,6 +852,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/ngircd-handle-zombies.patch \
|
||||
%D%/packages/patches/ninja-zero-mtime.patch \
|
||||
%D%/packages/patches/node-9077.patch \
|
||||
%D%/packages/patches/nss-disable-long-b64-tests.patch \
|
||||
%D%/packages/patches/nss-increase-test-timeout.patch \
|
||||
%D%/packages/patches/nss-pkgconfig.patch \
|
||||
%D%/packages/patches/ntfs-3g-CVE-2017-0358.patch \
|
||||
|
@ -826,11 +877,13 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/ots-no-include-missing-file.patch \
|
||||
%D%/packages/patches/p7zip-CVE-2016-9296.patch \
|
||||
%D%/packages/patches/p7zip-remove-unused-code.patch \
|
||||
%D%/packages/patches/password-store-gnupg-compat.patch \
|
||||
%D%/packages/patches/patchelf-page-size.patch \
|
||||
%D%/packages/patches/patchelf-rework-for-arm.patch \
|
||||
%D%/packages/patches/patchutils-xfail-gendiff-tests.patch \
|
||||
%D%/packages/patches/patch-hurd-path-max.patch \
|
||||
%D%/packages/patches/pcre-CVE-2017-7186.patch \
|
||||
%D%/packages/patches/pcre2-CVE-2017-7186.patch \
|
||||
%D%/packages/patches/pcre2-CVE-2017-8786.patch \
|
||||
%D%/packages/patches/perl-autosplit-default-time.patch \
|
||||
%D%/packages/patches/perl-deterministic-ordering.patch \
|
||||
%D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
|
||||
|
@ -838,7 +891,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/perl-io-socket-ssl-openssl-1.0.2f-fix.patch \
|
||||
%D%/packages/patches/perl-net-amazon-s3-moose-warning.patch \
|
||||
%D%/packages/patches/perl-net-ssleay-disable-ede-test.patch \
|
||||
%D%/packages/patches/perl-net-dns-resolver-programmable-Fix-broken-interface.patch \
|
||||
%D%/packages/patches/perl-net-dns-resolver-programmable-fix.patch \
|
||||
%D%/packages/patches/perl-no-sys-dirs.patch \
|
||||
%D%/packages/patches/perl-module-pluggable-search.patch \
|
||||
%D%/packages/patches/perl-reproducible-build-date.patch \
|
||||
|
@ -855,10 +908,12 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/plink-endian-detection.patch \
|
||||
%D%/packages/patches/plotutils-libpng-jmpbuf.patch \
|
||||
%D%/packages/patches/polkit-drop-test.patch \
|
||||
%D%/packages/patches/policycoreutils-make-sepolicy-use-python3.patch \
|
||||
%D%/packages/patches/portaudio-audacity-compat.patch \
|
||||
%D%/packages/patches/portmidi-modular-build.patch \
|
||||
%D%/packages/patches/procmail-ambiguous-getline-debian.patch \
|
||||
%D%/packages/patches/procmail-CVE-2014-3618.patch \
|
||||
%D%/packages/patches/proot-test-fhs.patch \
|
||||
%D%/packages/patches/pt-scotch-build-parallelism.patch \
|
||||
%D%/packages/patches/pulseaudio-fix-mult-test.patch \
|
||||
%D%/packages/patches/pulseaudio-longer-test-timeout.patch \
|
||||
|
@ -883,6 +938,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
|
||||
%D%/packages/patches/python-statsmodels-fix-tests.patch \
|
||||
%D%/packages/patches/python-configobj-setuptools.patch \
|
||||
%D%/packages/patches/python-cython-fix-tests-32bit.patch \
|
||||
%D%/packages/patches/python-fake-factory-fix-build-32bit.patch \
|
||||
%D%/packages/patches/python-faker-fix-build-32bit.patch \
|
||||
%D%/packages/patches/python-pandas-skip-failing-tests.patch \
|
||||
|
@ -895,20 +951,9 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
|
||||
%D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
|
||||
%D%/packages/patches/python2-subprocess32-disable-input-test.patch \
|
||||
%D%/packages/patches/qemu-CVE-2016-10155.patch \
|
||||
%D%/packages/patches/qemu-CVE-2017-2615.patch \
|
||||
%D%/packages/patches/qemu-CVE-2017-2620.patch \
|
||||
%D%/packages/patches/qemu-CVE-2017-2630.patch \
|
||||
%D%/packages/patches/qemu-CVE-2017-5525.patch \
|
||||
%D%/packages/patches/qemu-CVE-2017-5526.patch \
|
||||
%D%/packages/patches/qemu-CVE-2017-5552.patch \
|
||||
%D%/packages/patches/qemu-CVE-2017-5578.patch \
|
||||
%D%/packages/patches/qemu-CVE-2017-5579.patch \
|
||||
%D%/packages/patches/qemu-CVE-2017-5667.patch \
|
||||
%D%/packages/patches/qemu-CVE-2017-5856.patch \
|
||||
%D%/packages/patches/qemu-CVE-2017-5898.patch \
|
||||
%D%/packages/patches/qemu-CVE-2017-5931.patch \
|
||||
%D%/packages/patches/qemu-CVE-2017-7493.patch \
|
||||
%D%/packages/patches/qt4-ldflags.patch \
|
||||
%D%/packages/patches/qtscript-disable-tests.patch \
|
||||
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \
|
||||
%D%/packages/patches/rapicorn-isnan.patch \
|
||||
%D%/packages/patches/ratpoison-shell.patch \
|
||||
|
@ -916,7 +961,9 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/readline-link-ncurses.patch \
|
||||
%D%/packages/patches/readline-6.2-CVE-2014-2524.patch \
|
||||
%D%/packages/patches/readline-7.0-mingw.patch \
|
||||
%D%/packages/patches/reptyr-fix-gcc-7.patch \
|
||||
%D%/packages/patches/ripperx-missing-file.patch \
|
||||
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
|
||||
%D%/packages/patches/rpm-CVE-2014-8118.patch \
|
||||
%D%/packages/patches/rsem-makefile.patch \
|
||||
%D%/packages/patches/ruby-concurrent-ignore-broken-test.patch \
|
||||
|
@ -926,19 +973,15 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
|
||||
%D%/packages/patches/scheme48-tests.patch \
|
||||
%D%/packages/patches/scotch-test-threading.patch \
|
||||
%D%/packages/patches/screen-fix-info-syntax-error.patch \
|
||||
%D%/packages/patches/sdl-libx11-1.6.patch \
|
||||
%D%/packages/patches/seq24-rename-mutex.patch \
|
||||
%D%/packages/patches/serf-comment-style-fix.patch \
|
||||
%D%/packages/patches/serf-deflate-buckets-test-fix.patch \
|
||||
%D%/packages/patches/shadow-4.4-su-snprintf-fix.patch \
|
||||
%D%/packages/patches/shadow-CVE-2017-2616.patch \
|
||||
%D%/packages/patches/slim-session.patch \
|
||||
%D%/packages/patches/slim-config.patch \
|
||||
%D%/packages/patches/slim-sigusr1.patch \
|
||||
%D%/packages/patches/slim-reset.patch \
|
||||
%D%/packages/patches/slim-login.patch \
|
||||
%D%/packages/patches/slurm-configure-remove-nonfree-contribs.patch \
|
||||
%D%/packages/patches/soprano-find-clucene.patch \
|
||||
%D%/packages/patches/spice-CVE-2016-9577.patch \
|
||||
%D%/packages/patches/spice-CVE-2016-9578-1.patch \
|
||||
%D%/packages/patches/spice-CVE-2016-9578-2.patch \
|
||||
|
@ -957,6 +1000,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/tcsh-fix-autotest.patch \
|
||||
%D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \
|
||||
%D%/packages/patches/teensy-loader-cli-help.patch \
|
||||
%D%/packages/patches/teeworlds-use-latest-wavpack.patch \
|
||||
%D%/packages/patches/texlive-texmf-CVE-2016-10243.patch \
|
||||
%D%/packages/patches/texi2html-document-encoding.patch \
|
||||
%D%/packages/patches/texi2html-i18n.patch \
|
||||
|
@ -986,7 +1030,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/unzip-remove-build-date.patch \
|
||||
%D%/packages/patches/ustr-fix-build-with-gcc-5.patch \
|
||||
%D%/packages/patches/util-linux-tests.patch \
|
||||
%D%/packages/patches/util-linux-CVE-2017-2616.patch \
|
||||
%D%/packages/patches/upower-builddir.patch \
|
||||
%D%/packages/patches/valgrind-enable-arm.patch \
|
||||
%D%/packages/patches/virglrenderer-CVE-2017-6386.patch \
|
||||
|
@ -1004,6 +1047,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/wicd-urwid-1.3.patch \
|
||||
%D%/packages/patches/wicd-wpa2-ttls.patch \
|
||||
%D%/packages/patches/wmctrl-64-fix.patch \
|
||||
%D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \
|
||||
%D%/packages/patches/woff2-libbrotli.patch \
|
||||
%D%/packages/patches/wordnet-CVE-2008-2149.patch \
|
||||
%D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch \
|
||||
|
@ -1017,8 +1061,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/xf86-video-ast-remove-mibstore.patch \
|
||||
%D%/packages/patches/xf86-video-geode-glibc-2.20.patch \
|
||||
%D%/packages/patches/xf86-video-i128-remove-mibstore.patch \
|
||||
%D%/packages/patches/xf86-video-intel-compat-api.patch \
|
||||
%D%/packages/patches/xf86-video-intel-glibc-2.20.patch \
|
||||
%D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \
|
||||
%D%/packages/patches/xf86-video-tga-remove-mibstore.patch \
|
||||
%D%/packages/patches/xfce4-panel-plugins.patch \
|
||||
|
@ -1088,13 +1130,15 @@ nodist_bootstrap_mips64el_linux_DATA = \
|
|||
set-bootstrap-executable-permissions:
|
||||
chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz}
|
||||
|
||||
DISTCLEANFILES = \
|
||||
BOOTSTRAP_GUILE_TARBALLS = \
|
||||
$(nodist_bootstrap_x86_64_linux_DATA) \
|
||||
$(nodist_bootstrap_i686_linux_DATA) \
|
||||
$(nodist_bootstrap_armhf_linux_DATA) \
|
||||
$(nodist_bootstrap_aarch64_linux_DATA) \
|
||||
$(nodist_bootstrap_aarch64_linux_DATA) \
|
||||
$(nodist_bootstrap_mips64el_linux_DATA)
|
||||
|
||||
DISTCLEANFILES = $(BOOTSTRAP_GUILE_TARBALLS)
|
||||
|
||||
# Method to download a file from an external source.
|
||||
DOWNLOAD_FILE = \
|
||||
GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \
|
||||
|
|
124
gnu/packages.scm
124
gnu/packages.scm
|
@ -24,12 +24,11 @@
|
|||
#:use-module (guix packages)
|
||||
#:use-module (guix ui)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix discovery)
|
||||
#:use-module (guix memoization)
|
||||
#:use-module (guix combinators)
|
||||
#:use-module ((guix build utils)
|
||||
#:select ((package-name->name+version
|
||||
. hyphen-separated-name->name+version)))
|
||||
#:use-module (ice-9 ftw)
|
||||
#:use-module (ice-9 vlist)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (srfi srfi-1)
|
||||
|
@ -48,7 +47,6 @@
|
|||
%package-module-path
|
||||
|
||||
fold-packages
|
||||
scheme-modules ;XXX: for lack of a better place
|
||||
|
||||
find-packages-by-name
|
||||
find-best-packages-by-name
|
||||
|
@ -89,7 +87,7 @@
|
|||
"Search the patch FILE-NAME. Raise an error if not found."
|
||||
(or (search-path (%patch-path) file-name)
|
||||
(raise (condition
|
||||
(&message (message (format #f (_ "~a: patch not found")
|
||||
(&message (message (format #f (G_ "~a: patch not found")
|
||||
file-name)))))))
|
||||
|
||||
(define-syntax-rule (search-patches file-name ...)
|
||||
|
@ -105,7 +103,7 @@ found."
|
|||
(raise (condition
|
||||
(&message
|
||||
(message
|
||||
(format #f (_ "could not find bootstrap binary '~a' \
|
||||
(format #f (G_ "could not find bootstrap binary '~a' \
|
||||
for system '~a'")
|
||||
file-name system)))))))
|
||||
|
||||
|
@ -140,92 +138,17 @@ for system '~a'")
|
|||
directory))
|
||||
%load-path)))
|
||||
|
||||
(define* (scheme-files directory)
|
||||
"Return the list of Scheme files found under DIRECTORY, recursively. The
|
||||
returned list is sorted in alphabetical order."
|
||||
|
||||
;; Sort entries so that 'fold-packages' works in a deterministic fashion
|
||||
;; regardless of details of the underlying file system.
|
||||
(sort (file-system-fold (const #t) ; enter?
|
||||
(lambda (path stat result) ; leaf
|
||||
(if (string-suffix? ".scm" path)
|
||||
(cons path result)
|
||||
result))
|
||||
(lambda (path stat result) ; down
|
||||
result)
|
||||
(lambda (path stat result) ; up
|
||||
result)
|
||||
(const #f) ; skip
|
||||
(lambda (path stat errno result)
|
||||
(warning (_ "cannot access `~a': ~a~%")
|
||||
path (strerror errno))
|
||||
result)
|
||||
'()
|
||||
directory
|
||||
stat)
|
||||
string<?))
|
||||
|
||||
(define file-name->module-name
|
||||
(let ((not-slash (char-set-complement (char-set #\/))))
|
||||
(lambda (file)
|
||||
"Return the module name (a list of symbols) corresponding to FILE."
|
||||
(map string->symbol
|
||||
(string-tokenize (string-drop-right file 4) not-slash)))))
|
||||
|
||||
(define* (scheme-modules directory #:optional sub-directory)
|
||||
"Return the list of Scheme modules available under DIRECTORY.
|
||||
Optionally, narrow the search to SUB-DIRECTORY."
|
||||
(define prefix-len
|
||||
(string-length directory))
|
||||
|
||||
(filter-map (lambda (file)
|
||||
(let* ((file (substring file prefix-len))
|
||||
(module (file-name->module-name file)))
|
||||
(catch #t
|
||||
(lambda ()
|
||||
(resolve-interface module))
|
||||
(lambda args
|
||||
;; Report the error, but keep going.
|
||||
(warn-about-load-error module args)
|
||||
#f))))
|
||||
(scheme-files (if sub-directory
|
||||
(string-append directory "/" sub-directory)
|
||||
directory))))
|
||||
|
||||
(define* (all-package-modules #:optional (path (%package-module-path)))
|
||||
"Return the list of package modules found in PATH, a list of directories to
|
||||
search."
|
||||
(fold-right (lambda (spec result)
|
||||
(match spec
|
||||
((? string? directory)
|
||||
(append (scheme-modules directory) result))
|
||||
((directory . sub-directory)
|
||||
(append (scheme-modules directory sub-directory)
|
||||
result))))
|
||||
'()
|
||||
path))
|
||||
|
||||
(define (fold-packages proc init)
|
||||
"Call (PROC PACKAGE RESULT) for each available package, using INIT as
|
||||
the initial value of RESULT. It is guaranteed to never traverse the
|
||||
same package twice."
|
||||
(identity ; discard second return value
|
||||
(fold2 (lambda (module result seen)
|
||||
(fold2 (lambda (var result seen)
|
||||
(if (and (package? var)
|
||||
(not (vhash-assq var seen))
|
||||
(not (hidden-package? var)))
|
||||
(values (proc var result)
|
||||
(vhash-consq var #t seen))
|
||||
(values result seen)))
|
||||
result
|
||||
seen
|
||||
(module-map (lambda (sym var)
|
||||
(false-if-exception (variable-ref var)))
|
||||
module)))
|
||||
init
|
||||
vlist-null
|
||||
(all-package-modules))))
|
||||
(fold-module-public-variables (lambda (object result)
|
||||
(if (and (package? object)
|
||||
(not (hidden-package? object)))
|
||||
(proc object result)
|
||||
result))
|
||||
init
|
||||
(all-modules (%package-module-path))))
|
||||
|
||||
(define find-packages-by-name
|
||||
(let ((packages (delay
|
||||
|
@ -306,38 +229,25 @@ return its return value."
|
|||
;;; Package specification.
|
||||
;;;
|
||||
|
||||
(define* (%find-package spec name version #:key fallback?)
|
||||
(define* (%find-package spec name version)
|
||||
(match (find-best-packages-by-name name version)
|
||||
((pkg . pkg*)
|
||||
(unless (null? pkg*)
|
||||
(warning (_ "ambiguous package specification `~a'~%") spec)
|
||||
(warning (_ "choosing ~a@~a from ~a~%")
|
||||
(warning (G_ "ambiguous package specification `~a'~%") spec)
|
||||
(warning (G_ "choosing ~a@~a from ~a~%")
|
||||
(package-name pkg) (package-version pkg)
|
||||
(location->string (package-location pkg))))
|
||||
(when fallback?
|
||||
(warning (_ "deprecated NAME-VERSION syntax; \
|
||||
use NAME@VERSION instead~%")))
|
||||
|
||||
(match (package-superseded pkg)
|
||||
((? package? new)
|
||||
(info (_ "package '~a' has been superseded by '~a'~%")
|
||||
(info (G_ "package '~a' has been superseded by '~a'~%")
|
||||
(package-name pkg) (package-name new))
|
||||
new)
|
||||
(#f
|
||||
pkg)))
|
||||
(x
|
||||
(if version
|
||||
(leave (_ "~A: package not found for version ~a~%") name version)
|
||||
(if (not fallback?)
|
||||
;; XXX: Fallback to the older specification style with an hyphen
|
||||
;; between NAME and VERSION, for backward compatibility.
|
||||
(call-with-values
|
||||
(lambda ()
|
||||
(hyphen-separated-name->name+version name))
|
||||
(cut %find-package spec <> <> #:fallback? #t))
|
||||
|
||||
;; The fallback case didn't find anything either, so bail out.
|
||||
(leave (_ "~A: unknown package~%") name))))))
|
||||
(leave (G_ "~A: package not found for version ~a~%") name version)
|
||||
(leave (G_ "~A: unknown package~%") name)))))
|
||||
|
||||
(define (specification->package spec)
|
||||
"Return a package matching SPEC. SPEC may be a package name, or a package
|
||||
|
@ -365,6 +275,6 @@ version; if SPEC does not specify an output, return OUTPUT."
|
|||
(package
|
||||
(if (member sub-drv (package-outputs package))
|
||||
(values package sub-drv)
|
||||
(leave (_ "package `~a' lacks output `~a'~%")
|
||||
(leave (G_ "package `~a' lacks output `~a'~%")
|
||||
(package-full-name package)
|
||||
sub-drv))))))
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -44,7 +45,7 @@
|
|||
(define-public abiword
|
||||
(package
|
||||
(name "abiword")
|
||||
(version "3.0.1")
|
||||
(version "3.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -52,16 +53,11 @@
|
|||
(string-append "http://abisource.org/downloads/" name "/" version
|
||||
"/source/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1ik591rx15nn3n1297cwykl8wvrlgj78i528id9wbidgy3xzd570"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Ensure reproducibility.
|
||||
'(substitute* "src/wp/main/xp/abi_ver.cpp"
|
||||
(("__DATE__") "\"2017\"")
|
||||
(("__TIME__") "\"00:00\"")))
|
||||
(base32 "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg"))
|
||||
(patches
|
||||
(search-patches "abiword-wmf-version-lookup-fix.patch"
|
||||
"abiword-explictly-cast-bools.patch"))))
|
||||
"abiword-explictly-cast-bools.patch"
|
||||
"abiword-black-drawing-with-gtk322.patch"))))
|
||||
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments ;; NOTE: rsvg is disabled, since Abiword
|
||||
|
@ -84,7 +80,9 @@
|
|||
;; assertion 'G_IS_OBJECT (object)' failed
|
||||
;; Manually starting the X server before the test phase did not help
|
||||
;; the tests to pass.
|
||||
#:tests? #f))
|
||||
#:tests? #f
|
||||
#:make-flags
|
||||
(list "CXXFLAGS=-std=c++11")))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("enchant" ,enchant)
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
(define-public acct
|
||||
(package
|
||||
(name "acct")
|
||||
(version "6.6.2")
|
||||
(version "6.6.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -33,7 +33,7 @@
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0081hzkcxw9aslpsakridj15m0wbnkdhm210fzbg021vi4pppm4f"))))
|
||||
"14x0zklwlg7cc7amlyzffqr8az3fqj1h9dyj0hvl1kpi7cr7kbjy"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://gnu.org/software/acct/")
|
||||
(synopsis "Standard login and process accounting utilities")
|
||||
|
|
|
@ -8,13 +8,16 @@
|
|||
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
|
||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
|
||||
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
|
||||
;;; Coypright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
|
||||
;;; Coypright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Coypright © 2016 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
|
||||
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
|
||||
;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
|
||||
;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -67,28 +70,31 @@
|
|||
#:use-module (gnu packages texinfo)
|
||||
#:use-module (gnu packages groff)
|
||||
#:use-module (gnu packages pciutils)
|
||||
#:use-module (gnu packages libunwind)
|
||||
#:use-module (gnu packages libusb)
|
||||
#:use-module (gnu packages libftdi)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages man)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages kerberos)
|
||||
#:use-module (gnu packages gtk))
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages xml))
|
||||
|
||||
(define-public aide
|
||||
(package
|
||||
(name "aide")
|
||||
(version "0.15.1")
|
||||
(version "0.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/aide/aide/"
|
||||
version "/aide-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vsrc0s62kv1i84skm6k6zy868gayjck268qwj38rpspc8c5qgih"))))
|
||||
"0ibkv4z2gk14fn014kq13rp2ysiq6nn2cflv2q5i7zf466hm6758"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("bison" ,bison)
|
||||
|
@ -97,6 +103,7 @@
|
|||
`(("libgcrypt" ,libgcrypt)
|
||||
("libgpg-error" ,libgpg-error)
|
||||
("libmhash" ,libmhash)
|
||||
("pcre" ,pcre)
|
||||
("zlib" ,zlib)))
|
||||
(synopsis "File and directory integrity checker")
|
||||
(description
|
||||
|
@ -274,17 +281,15 @@ client and server, a telnet client and server, and an rsh client and server.")
|
|||
(define-public shadow
|
||||
(package
|
||||
(name "shadow")
|
||||
(version "4.4")
|
||||
(version "4.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/shadow-maint/shadow/releases/"
|
||||
"download/" version "/shadow-" version ".tar.xz"))
|
||||
(patches (search-patches "shadow-4.4-su-snprintf-fix.patch"
|
||||
"shadow-CVE-2017-2616.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0g7hf55ar2pafg5g3ldx0fwzjk36wf4xb21p4ndanbjm3c2a9ab1"))))
|
||||
"0hdpai78n63l3v3fgr3kkiqzhd0awrpfnnzz4mf7lmxdh61qb37w"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(;; Assume System V `setpgrp (void)', which is the default on GNU
|
||||
|
@ -477,7 +482,7 @@ connection alive.")
|
|||
(bind-minor-version "9")
|
||||
(bind-patch-version "9")
|
||||
(bind-release-type "-P") ; for patch release, use "-P"
|
||||
(bind-release-version "6") ; for patch release, e.g. "6"
|
||||
(bind-release-version "8") ; for patch release, e.g. "6"
|
||||
(bind-version (string-append bind-major-version
|
||||
"."
|
||||
bind-minor-version
|
||||
|
@ -593,7 +598,7 @@ connection alive.")
|
|||
"/bind-" bind-version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qf9j0nyqx0qy871mj22xh4dg0n1pqlv94lpiijb8vr7n7m3svhr"))))
|
||||
"1f5i64f6y4rmy61y63r5if1lifw8dw8r8dh6ns3x4002hanzrpgz"))))
|
||||
|
||||
;; When cross-compiling, we need the cross Coreutils and sed.
|
||||
;; Otherwise just use those from %FINAL-INPUTS.
|
||||
|
@ -1349,14 +1354,14 @@ of supported upstream metrics systems simultaneously.")
|
|||
(define-public ansible
|
||||
(package
|
||||
(name "ansible")
|
||||
(version "2.2.1.0")
|
||||
(version "2.3.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "ansible" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0gz9i30pdmkchi936ijy873k8di6fmf3v5rv551hxyf0hjkjx8b3"))))
|
||||
"0n54h8g6a6hcp41sasvjqa4yz1pwd8mshbwlcghj0sjnrl3kk7r9"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("python2-pycrypto" ,python2-pycrypto)
|
||||
|
@ -1691,7 +1696,7 @@ throughput (in the same interval).")
|
|||
(define-public thefuck
|
||||
(package
|
||||
(name "thefuck")
|
||||
(version "3.15")
|
||||
(version "3.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/nvbn/thefuck/archive/"
|
||||
|
@ -1699,7 +1704,7 @@ throughput (in the same interval).")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vxas21h5mf41cb6y7f7x07858ags7qg45lkf74rc0slqbic3l1h"))
|
||||
"0jrhfxmj2asx4jdix9ks3fpl364ph8w9prhwpk4488aj1a0q4rak"))
|
||||
(patches (search-patches "thefuck-test-environ.patch"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
|
@ -1760,7 +1765,7 @@ a new command using the matched rule, and runs it.")
|
|||
"'di' is a disk information utility, displaying everything
|
||||
(and more) that your @code{df} command does. It features the ability to
|
||||
display your disk usage in whatever format you prefer. It is designed to be
|
||||
highly portable. Great for heterogenous networks.")
|
||||
highly portable. Great for heterogeneous networks.")
|
||||
(license license:zlib)))
|
||||
|
||||
(define-public cbatticon
|
||||
|
@ -1997,3 +2002,231 @@ with all the commands and parameters identified for your viewing pleasure.
|
|||
With sedsed you can master any sed script. No more secrets, no more hidden
|
||||
buffers.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public intel-gpu-tools
|
||||
(package
|
||||
(name "intel-gpu-tools")
|
||||
(version "1.18")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://cgit.freedesktop.org/xorg/app/"
|
||||
"intel-gpu-tools/snapshot/"
|
||||
"intel-gpu-tools-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0w7djk0y5w76hzn1b3cm39zd5c6w9za1wfn80wd857h0v313rzq3"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; many of the tests try to load kernel modules
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'autogen
|
||||
(lambda _
|
||||
;; Don't run configure in this phase
|
||||
(setenv "NOCONFIGURE" "1")
|
||||
(zero? (system* "sh" "autogen.sh")))))))
|
||||
(inputs
|
||||
`(("util-macros" ,util-macros)
|
||||
("libdrm" ,libdrm)
|
||||
("libpciaccess" ,libpciaccess)
|
||||
("kmod" ,kmod)
|
||||
("procps" ,procps)
|
||||
("cairo" ,cairo)
|
||||
("libunwind" ,libunwind)
|
||||
("libxrandr" ,libxrandr)
|
||||
("glib" ,glib)))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(home-page "https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/")
|
||||
(synopsis "Tools for development and testing of the Intel DRM driver")
|
||||
(description "Intel GPU Tools is a collection of tools for development and
|
||||
testing of the Intel DRM driver. There are many macro-level test suites that
|
||||
get used against the driver, including xtest, rendercheck, piglit, and
|
||||
oglconform, but failures from those can be difficult to track down to kernel
|
||||
changes, and many require complicated build procedures or specific testing
|
||||
environments to get useful results. Therefore, Intel GPU Tools includes
|
||||
low-level tools and tests specifically for development and testing of the
|
||||
Intel DRM Driver.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public fabric
|
||||
(package
|
||||
(name "fabric")
|
||||
(version "1.13.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Fabric" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1z17hw0yiqp1blq217zxkg2jzkv8qd79saqhscgsw14mwlcqpwd0"))
|
||||
(patches (search-patches "fabric-tests.patch"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:python ,python-2)) ;Python 2 only
|
||||
(native-inputs
|
||||
`(("python2-fudge" ,python2-fudge) ; Requires < 1.0
|
||||
("python2-jinja2" ,python2-jinja2) ; Requires < 3.0
|
||||
("python2-nose" ,python2-nose))) ; Requires < 2.0
|
||||
(propagated-inputs
|
||||
;; Required upgrading python-paramiko 1.17.4 to fix an incompatibility
|
||||
;; between python-paramiko and newer python-pycrypto. Without this, the
|
||||
;; `fab` command fails with "ValueError: CTR mode needs counter
|
||||
;; parameter, not IV". See:
|
||||
;; https://github.com/paramiko/paramiko/pull/714#issuecomment-281191548.
|
||||
`(("python2-paramiko" ,python2-paramiko)))
|
||||
(home-page "http://fabfile.org")
|
||||
(synopsis "Simple Pythonic remote execution and deployment tool")
|
||||
(description
|
||||
"Fabric is designed to upload files and run shell commands on a number of
|
||||
servers in parallel or serially. These commands are grouped in tasks (which
|
||||
are regular Python functions) and specified in a @dfn{fabfile}.
|
||||
|
||||
It is similar to Capistrano, except it's implemented in Python and doesn't
|
||||
expect you to be deploying Rails applications. Fabric is a simple, Pythonic
|
||||
tool for remote execution and deployment.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public neofetch
|
||||
(package
|
||||
(name "neofetch")
|
||||
(version "3.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/dylanaraps/neofetch/"
|
||||
"archive/" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rgznkl7a5q7lnc6zxlwvinq20b7k46n949l1hiwifarv0jgwynv"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; there are no tests
|
||||
#:make-flags
|
||||
(list (string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-target-directories
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(substitute* "Makefile"
|
||||
(("\\$\\(DESTDIR\\)/etc/")
|
||||
"$(PREFIX)/etc/"))
|
||||
(substitute* "neofetch"
|
||||
(("\"/etc/neofetch")
|
||||
(string-append "\"" out "/etc/neofetch"))
|
||||
(("\"/usr/share/neofetch")
|
||||
(string-append "\"" out "/usr/share/neofetch"))))
|
||||
#t))
|
||||
(delete 'configure))))
|
||||
(home-page "https://github.com/dylanaraps/neofetch")
|
||||
(synopsis "System info script")
|
||||
(description "Neofetch is a CLI system information tool written in Bash.
|
||||
Neofetch displays information about your system next to an image, your OS
|
||||
logo, or any ASCII file of your choice. The main purpose of Neofetch is to be
|
||||
used in screenshots to show other users what operating system or distribution
|
||||
you are running, what theme or icon set you are using, etc.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public nnn
|
||||
(package
|
||||
(name "nnn")
|
||||
(version "1.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/jarun/nnn/"
|
||||
"archive/v" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hww4385f81lyy30fx2rb4wchfi79dpgl7yylnfxvf27a4h2mkhm"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("ncurses" ,ncurses)
|
||||
("readline" ,readline)))
|
||||
(arguments
|
||||
'(#:tests? #f ; no tests
|
||||
#:phases
|
||||
;; We do not provide `ncurses.h' within an `ncursesw'
|
||||
;; sub-directory, so patch the source accordingly. See
|
||||
;; <http://bugs.gnu.org/19018>.
|
||||
;; Thanks to gtypist maintainer.
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-curses-lib
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(substitute* "Makefile"
|
||||
(("-lncursesw")
|
||||
"-lncurses"))
|
||||
(substitute* "nnn.c"
|
||||
(("ncursesw\\/curses.h")
|
||||
"ncurses.h")))
|
||||
#t))
|
||||
(delete 'configure))
|
||||
#:make-flags
|
||||
(list
|
||||
(string-append "PREFIX="
|
||||
(assoc-ref %outputs "out"))
|
||||
(string-append "-Wl,-rpath="
|
||||
%output "/lib")
|
||||
"CC=gcc")))
|
||||
(home-page "https://github.com/jarun/nnn")
|
||||
(synopsis "Terminal file browser")
|
||||
(description "@command{nnn} is a fork of @command{noice}, a blazing-fast
|
||||
lightweight terminal file browser with easy keyboard shortcuts for
|
||||
navigation, opening files and running tasks. There is no config file and
|
||||
mime associations are hard-coded. The incredible user-friendliness and speed
|
||||
make it a perfect utility on modern distros.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public thermald
|
||||
(package
|
||||
(name "thermald")
|
||||
(version "1.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/01org/thermal_daemon/archive/v"
|
||||
version ".tar.gz"))
|
||||
(sha256 (base32
|
||||
"14klz9fnvi9jdlaqwrp61xa5nh051n8ykrs1fh1wxd7j66qf2fn6"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
(add-after
|
||||
'unpack 'autogen.sh-and-fix-paths
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
;; upstartconfir is hardcoded to /etc/init and the build
|
||||
;; system tries to mkdir that. We don't even need upstart
|
||||
;; files at all; this is a fast and kludgy workaround
|
||||
(substitute* "data/Makefile.am"
|
||||
(("upstartconfdir = /etc/init")
|
||||
(string-append "upstartconfdir = "
|
||||
out "/etc/init")))
|
||||
;; Now run autogen
|
||||
(zero? (system* "sh" "autogen.sh"))))))
|
||||
#:configure-flags
|
||||
(let ((out (assoc-ref %outputs "out")))
|
||||
(list (string-append "--sysconfdir="
|
||||
out "/etc")
|
||||
(string-append "--with-udev-dir="
|
||||
out "/lib/udev")
|
||||
(string-append "--with-dbus-sys-dir="
|
||||
out "/etc/dbus-1/system.d")
|
||||
"--localstatedir=/var"))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("glib" ,glib "bin") ; for glib-genmarshal, etc.
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("dbus-glib" ,dbus-glib)
|
||||
("libxml2" ,libxml2)))
|
||||
(home-page "https://01.org/linux-thermal-daemon/")
|
||||
(synopsis "CPU scaling for thermal management")
|
||||
(description "The Linux Thermal Daemon helps monitor and control temperature
|
||||
on systems running the Linux kernel.")
|
||||
(license license:gpl2+)))
|
||||
|
|
|
@ -1,10 +1,12 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2013, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2016, 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -26,26 +28,28 @@
|
|||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages ed)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages fltk)
|
||||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages graphviz)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages multiprecision)
|
||||
#:use-module (gnu packages maths)
|
||||
#:use-module (gnu packages mpi)
|
||||
#:use-module (gnu packages multiprecision)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages shells)
|
||||
#:use-module (gnu packages tex)
|
||||
#:use-module (gnu packages texinfo)
|
||||
#:use-module (gnu packages xiph)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix download)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils))
|
||||
|
||||
|
||||
|
@ -203,7 +207,7 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.")
|
|||
(define-public giac-xcas
|
||||
(package
|
||||
(name "giac-xcas")
|
||||
(version "1.2.3-25")
|
||||
(version "1.2.3-37")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
;; "~parisse/giac" is not used because the maintainer regularly
|
||||
|
@ -215,7 +219,7 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.")
|
|||
"source/giac_" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0d6a42p8111raf7k16yvjajnpj22abiqndy3yzkrb4b8l071r24d"))))
|
||||
"180146rm8fxlbd6x25x81yscf6q8qjpzr35k203r25c2xkcb7h2x"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -468,34 +472,21 @@ binary.")
|
|||
(define-public bc
|
||||
(package
|
||||
(name "bc")
|
||||
(version "1.06")
|
||||
(version "1.07.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/bc/bc-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf"))))
|
||||
"0amh9ik44jfg66csyvf4zz1l878c4755kjndq9j0270akflgrbb2"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("readline" ,readline)))
|
||||
(native-inputs `(("flex" ,flex)))
|
||||
(native-inputs
|
||||
`(("ed" ,ed)
|
||||
("flex" ,flex)
|
||||
("texinfo" ,texinfo)))
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; This old `configure' script doesn't support
|
||||
;; variables passed as arguments.
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(setenv "CONFIG_SHELL" (which "bash"))
|
||||
(zero?
|
||||
(system*
|
||||
"./configure"
|
||||
(string-append "--prefix=" out)
|
||||
;; By default, man and info pages are put in
|
||||
;; PREFIX/{man,info}, but we want them in
|
||||
;; PREFIX/share/{man,info}.
|
||||
(string-append "--mandir=" out "/share/man")
|
||||
(string-append "--infodir=" out "/share/info")))))))))
|
||||
'(#:configure-flags
|
||||
(list "--with-readline")))
|
||||
(home-page "https://www.gnu.org/software/bc/")
|
||||
(synopsis "Arbitrary precision numeric processing language")
|
||||
(description
|
||||
|
|
|
@ -0,0 +1,300 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012 Stefan Handschuh <handschuh.stefan@googlemail.com>
|
||||
;;; Copyright © 2015 Kai-Chung Yan <seamlikok@gmail.com>
|
||||
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
|
||||
;;;
|
||||
;;; 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 android)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages tls))
|
||||
|
||||
;; The Makefiles that we add are largely based on the Debian
|
||||
;; packages. They are licensed under GPL-2 and have copyright:
|
||||
;; 2012, Stefan Handschuh <handschuh.stefan@googlemail.com>
|
||||
;; 2015, Kai-Chung Yan <seamlikok@gmail.com>
|
||||
;; Big thanks to them for laying the groundwork.
|
||||
|
||||
;; The version tag is consistent between all repositories.
|
||||
(define (android-platform-version) "7.1.2_r6")
|
||||
|
||||
(define (android-platform-system-core version)
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://android.googlesource.com/platform/system/core")
|
||||
(commit (string-append "android-" version))))
|
||||
(file-name (string-append "android-platform-system-core-"
|
||||
version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xc2n7jxrf1iw9cc278pijdfjix2fkiig5ws27f6rwp40zg5mrgg"))))
|
||||
|
||||
(define liblog
|
||||
(package
|
||||
(name "liblog")
|
||||
(version (android-platform-version))
|
||||
(source (android-platform-system-core version))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; TODO.
|
||||
#:make-flags '("CC=gcc")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'enter-source
|
||||
(lambda _ (chdir "liblog") #t))
|
||||
(add-after 'enter-source 'create-Makefile
|
||||
(lambda _
|
||||
;; No useful makefile is shipped, so we create one.
|
||||
(with-output-to-file "Makefile"
|
||||
(lambda _
|
||||
(display
|
||||
(string-append
|
||||
"NAME = liblog\n"
|
||||
"SOURCES = log_event_list.c log_event_write.c"
|
||||
" logger_write.c config_write.c logger_name.c"
|
||||
" logger_lock.c fake_log_device.c fake_writer.c"
|
||||
" event_tag_map.c\n"
|
||||
|
||||
"CFLAGS += -fvisibility=hidden -fPIC\n"
|
||||
"CPPFLAGS += -I../include -DFAKE_LOG_DEVICE=1"
|
||||
;; Keep these two in sync with "liblog/Android.bp".
|
||||
" -DLIBLOG_LOG_TAG=1005"
|
||||
" -DSNET_EVENT_LOG_TAG=1397638484\n"
|
||||
"LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 -lpthread\n"
|
||||
|
||||
"build: $(SOURCES)\n"
|
||||
" $(CC) $^ -o $(NAME).so.0 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)\n"))
|
||||
#t))))
|
||||
(delete 'configure)
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(lib (string-append out "/lib")))
|
||||
(install-file "liblog.so.0" lib)
|
||||
(with-directory-excursion lib
|
||||
(symlink "liblog.so.0" "liblog.so"))
|
||||
#t))))))
|
||||
(home-page "https://developer.android.com/")
|
||||
(synopsis "Logging library from the Android platform.")
|
||||
(description "@code{liblog} represents an interface to the volatile Android
|
||||
Logging system for NDK (Native) applications and libraries and contain
|
||||
interfaces for either writing or reading logs. The log buffers are divided up
|
||||
in Main, System, Radio and Events sub-logs.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define libbase
|
||||
(package
|
||||
(name "libbase")
|
||||
(version (android-platform-version))
|
||||
(source (origin
|
||||
(inherit (android-platform-system-core version))
|
||||
(patches
|
||||
(search-patches "libbase-use-own-logging.patch"
|
||||
"libbase-fix-includes.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; TODO.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'enter-source
|
||||
(lambda _ (chdir "base") #t))
|
||||
(add-after 'enter-source 'create-Makefile
|
||||
(lambda _
|
||||
;; No useful makefile is shipped, so we create one.
|
||||
(with-output-to-file "Makefile"
|
||||
(lambda _
|
||||
(display
|
||||
(string-append
|
||||
"NAME = libbase\n"
|
||||
"SOURCES = file.cpp logging.cpp parsenetaddress.cpp"
|
||||
" stringprintf.cpp strings.cpp errors_unix.cpp\n"
|
||||
|
||||
"CXXFLAGS += -std=gnu++11 -fPIC\n"
|
||||
"CPPFLAGS += -Iinclude -I../include\n"
|
||||
"LDFLAGS += -shared -Wl,-soname,$(NAME).so.0"
|
||||
" -L.. -llog\n"
|
||||
|
||||
"build: $(SOURCES)\n"
|
||||
" $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS)"
|
||||
" $(LDFLAGS)\n"))
|
||||
#t))))
|
||||
(delete 'configure)
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(lib (string-append out "/lib")))
|
||||
(install-file "libbase.so.0" lib)
|
||||
(with-directory-excursion lib
|
||||
(symlink "libbase.so.0" "libbase.so"))
|
||||
(copy-recursively "include" out)
|
||||
#t))))))
|
||||
(inputs `(("liblog" ,liblog)))
|
||||
(home-page "https://developer.android.com/")
|
||||
(synopsis "Android platform base library")
|
||||
(description "@code{libbase} is a library in common use by the
|
||||
various Android core host applications.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define libcutils
|
||||
(package
|
||||
(name "libcutils")
|
||||
(version (android-platform-version))
|
||||
(source (android-platform-system-core version))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; TODO.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'enter-source
|
||||
(lambda _ (chdir "libcutils") #t))
|
||||
(add-after 'enter-source 'create-Makefile
|
||||
(lambda _
|
||||
;; No useful makefile is shipped, so we create one.
|
||||
(with-output-to-file "Makefile"
|
||||
(lambda _
|
||||
(display
|
||||
(string-append
|
||||
"NAME = libcutils\n"
|
||||
"SOURCES = load_file.o socket_local_client_unix.o"
|
||||
" socket_loopback_client_unix.o socket_network_client_unix.o"
|
||||
" socket_loopback_server_unix.o socket_local_server_unix.o"
|
||||
" sockets_unix.o socket_inaddr_any_server_unix.o"
|
||||
" sockets.o\n"
|
||||
"CC = gcc\n"
|
||||
|
||||
"CFLAGS += -fPIC\n"
|
||||
"CXXFLAGS += -std=gnu++11 -fPIC\n"
|
||||
"CPPFLAGS += -Iinclude -I../include\n"
|
||||
"LDFLAGS += -shared -Wl,-soname,$(NAME).so.0\n"
|
||||
|
||||
"build: $(SOURCES)\n"
|
||||
" $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS)"
|
||||
" $(LDFLAGS)\n"))
|
||||
#t))))
|
||||
(delete 'configure)
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(lib (string-append out "/lib")))
|
||||
(install-file "libcutils.so.0" lib)
|
||||
(with-directory-excursion lib
|
||||
(symlink "libcutils.so.0" "libcutils.so"))
|
||||
#t))))))
|
||||
(home-page "https://developer.android.com/")
|
||||
(synopsis "Android platform c utils library")
|
||||
(description "@code{libcutils} is a library in common use by the
|
||||
various Android core host applications.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public adb
|
||||
(package
|
||||
(name "adb")
|
||||
(version (android-platform-version))
|
||||
(source (origin
|
||||
(inherit (android-platform-system-core version))
|
||||
(patches
|
||||
(search-patches "libbase-use-own-logging.patch"
|
||||
"libbase-fix-includes.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'enter-source
|
||||
(lambda _ (chdir "adb") #t))
|
||||
(add-before 'build 'fix-clang
|
||||
(lambda _
|
||||
;; adb_client.h contains _Nonnull and _Nullable attributes, that
|
||||
;; are not understood by gcc.
|
||||
(substitute* "adb_client.h"
|
||||
(("_Nonnull") "")
|
||||
(("_Nullable") ""))
|
||||
#t))
|
||||
(add-before 'build 'fix-main
|
||||
(lambda _
|
||||
;; main.cpp used to be adb_main.cpp in the current directory
|
||||
;; rather than in its own subdirectory, but it was not fixed.
|
||||
;; This leads to some header files not being found anymore.
|
||||
(copy-file "client/main.cpp" "adb_main.cpp")
|
||||
#t))
|
||||
(add-after 'enter-source 'create-Makefile
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; No useful makefile is shipped, so we create one.
|
||||
(with-output-to-file "Makefile"
|
||||
(lambda _
|
||||
(display
|
||||
(string-append
|
||||
;; Common for all components.
|
||||
"CXXFLAGS += -std=gnu++14 -fpermissive\n"
|
||||
"CPPFLAGS += -I../include -I../base/include -I. -DADB_HOST=1 "
|
||||
"-DADB_REVISION='\"" ,version "\"' -fPIC\n"
|
||||
"LDFLAGS += -lcrypto -lpthread -lbase -lcutils -L. -ladb\n"
|
||||
|
||||
;; Libadb specifics.
|
||||
"LIBADB_SOURCES = adb.cpp adb_auth.cpp adb_io.cpp "
|
||||
"adb_listeners.cpp adb_trace.cpp adb_utils.cpp fdevent.cpp "
|
||||
"sockets.cpp transport.cpp transport_local.cpp transport_usb.cpp "
|
||||
"get_my_path_linux.cpp sysdeps_unix.cpp usb_linux.cpp "
|
||||
"adb_auth_host.cpp diagnose_usb.cpp services.cpp "
|
||||
"shell_service_protocol.cpp bugreport.cpp line_printer.cpp\n"
|
||||
|
||||
"LIBADB_LDFLAGS += -shared -Wl,-soname,libadb.so.0 "
|
||||
"-lcrypto -lpthread -lbase\n"
|
||||
|
||||
;; Adb specifics.
|
||||
"ADB_SOURCES = adb_main.cpp console.cpp commandline.cpp "
|
||||
"adb_client.cpp file_sync_client.cpp\n"
|
||||
"ADB_LDFLAGS += -Wl,-rpath=" (assoc-ref outputs "out") "/lib\n"
|
||||
|
||||
"build: libadb $(ADB_SOURCES)\n"
|
||||
" $(CXX) $(ADB_SOURCES) -o adb $(CXXFLAGS) $(CPPFLAGS) "
|
||||
"$(ADB_LDFLAGS) $(LDFLAGS)\n"
|
||||
|
||||
"libadb: $(LIBADB_SOURCES)\n"
|
||||
" $(CXX) $^ -o libadb.so.0 $(CXXFLAGS) $(CPPFLAGS) "
|
||||
"$(LIBADB_LDFLAGS)\n"
|
||||
" ln -sv libadb.so.0 libadb.so\n"))
|
||||
#t))))
|
||||
(delete 'configure)
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(lib (string-append out "/lib"))
|
||||
(bin (string-append out "/bin")))
|
||||
(install-file "libadb.so.0" lib)
|
||||
(install-file "adb" bin)
|
||||
(with-directory-excursion lib
|
||||
(symlink "libadb.so.0" "libadb.so"))
|
||||
#t))))
|
||||
;; Test suite must be run with attached devices
|
||||
#:tests? #f))
|
||||
(inputs
|
||||
`(("libbase" ,libbase)
|
||||
("libcutils" ,libcutils)
|
||||
("openssl" ,openssl)))
|
||||
(home-page "https://developer.android.com/studio/command-line/adb.html")
|
||||
(synopsis "Android Debug Bridge")
|
||||
(description
|
||||
"@command{adb} is a versatile command line tool that lets you communicate
|
||||
with an emulator instance or connected Android device. It facilitates a variety
|
||||
of device actions, such as installing and debugging apps, and it provides access
|
||||
to a Unix shell that can run commands on the connected device or emulator.")
|
||||
(license license:asl2.0)))
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
|
@ -26,6 +26,7 @@
|
|||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages base))
|
||||
|
||||
|
@ -40,7 +41,8 @@
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"))))
|
||||
"1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"))
|
||||
(patches (search-patches "aspell-default-dict-dir.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -53,6 +55,15 @@
|
|||
'("ASPELL_CONF" "" =
|
||||
("${ASPELL_CONF:-\"dict-dir ${GUIX_PROFILE:-$HOME/.guix-profile}/lib/aspell\"}")))))))))
|
||||
(inputs `(("perl" ,perl)))
|
||||
|
||||
(native-search-paths
|
||||
;; This is a Guix-specific environment variable that takes a single
|
||||
;; entry, not an actual search path.
|
||||
(list (search-path-specification
|
||||
(variable "ASPELL_DICT_DIR")
|
||||
(separator #f)
|
||||
(files '("lib/aspell")))))
|
||||
|
||||
(home-page "http://aspell.net/")
|
||||
(synopsis "Spell checker")
|
||||
(description
|
||||
|
@ -62,12 +73,12 @@ documents written in the UTF-8 encoding and its ability to use multiple
|
|||
dictionaries, including personal ones.")
|
||||
(license lgpl2.1+)))
|
||||
|
||||
|
||||
;;;
|
||||
;;; Dictionaries.
|
||||
;;;
|
||||
;;; Use 'export ASPELL_CONF="dict-dir $HOME/.guix-profile/lib/aspell"' to use
|
||||
;;; them.
|
||||
;;; them, or set the Guix-specific 'ASPELL_DICT_DIR', or just do nothing (as
|
||||
;;; long as 'HOME' is set, that's fine!).
|
||||
;;;
|
||||
|
||||
(define* (aspell-dictionary dict-name full-name
|
||||
|
@ -190,3 +201,11 @@ dictionaries, including personal ones.")
|
|||
#:sha256
|
||||
(base32
|
||||
"1zxr8958v37v260fkqd4pg37ns5h5kyqm54hn1hg70wq5cz8h512")))
|
||||
|
||||
(define-public aspell-dict-pt-br
|
||||
(aspell-dictionary "pt-br" "Brazilian Portuguese"
|
||||
#:version "20090702-0"
|
||||
#:prefix "aspell6-"
|
||||
#:sha256
|
||||
(base32
|
||||
"1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p")))
|
||||
|
|
|
@ -1,103 +0,0 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages audacity)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages audio)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages mp3)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages pulseaudio)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages xiph)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages wxwidgets))
|
||||
|
||||
(define-public audacity
|
||||
(package
|
||||
(name "audacity")
|
||||
(version "2.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/audacity/audacity/archive"
|
||||
"/Audacity-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "1642i9d5cdmqzj6r0qdl2ldnqsvpb08znnczncysi72x6zpvb5qq"))
|
||||
(patches (search-patches "audacity-fix-ffmpeg-binding.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree
|
||||
;; versions shipping with Audacity are used for now.
|
||||
`(("wxwidgets" ,wxwidgets-gtk2)
|
||||
("gtk" ,gtk+-2)
|
||||
("alsa-lib" ,alsa-lib)
|
||||
("jack" ,jack-1)
|
||||
("expat" ,expat)
|
||||
("ffmpeg" ,ffmpeg)
|
||||
("lame" ,lame)
|
||||
("flac" ,flac)
|
||||
("libid3tag" ,libid3tag)
|
||||
("libmad" ,libmad)
|
||||
("libsbsms" ,libsbsms)
|
||||
("libsndfile" ,libsndfile)
|
||||
("soundtouch" ,soundtouch)
|
||||
("soxr" ,soxr) ;replaces libsamplerate
|
||||
("twolame" ,twolame)
|
||||
("vamp" ,vamp)
|
||||
("libvorbis" ,libvorbis)
|
||||
("lv2" ,lv2)
|
||||
("lilv" ,lilv)
|
||||
("portaudio" ,portaudio)))
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal) ;for msgfmt
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-2)
|
||||
("which" ,which)))
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
(let ((libid3tag (assoc-ref %build-inputs "libid3tag"))
|
||||
(libmad (assoc-ref %build-inputs "libmad")))
|
||||
(list
|
||||
;; Loading FFmpeg dynamically is problematic.
|
||||
"--disable-dynamic-loading"
|
||||
;; libid3tag and libmad provide no .pc files, so pkg-config fails to
|
||||
;; find them. Force their inclusion.
|
||||
(string-append "ID3TAG_CFLAGS=-I" libid3tag "/include")
|
||||
(string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz")
|
||||
(string-append "LIBMAD_CFLAGS=-I" libmad "/include")
|
||||
(string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad")))
|
||||
;; The test suite is not "well exercised" according to the developers,
|
||||
;; and fails with various errors. See
|
||||
;; <http://sourceforge.net/p/audacity/mailman/message/33524292/>.
|
||||
#:tests? #f))
|
||||
(home-page "http://audacity.sourceforge.net/")
|
||||
(synopsis "Software for recording and editing sounds")
|
||||
(description
|
||||
"Audacity is a multi-track audio editor designed for recording, playing
|
||||
and editing digital audio. It features digital effects and spectrum analysis
|
||||
tools.")
|
||||
(license license:gpl2+)))
|
|
@ -4,7 +4,7 @@
|
|||
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
|
||||
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
|
||||
|
@ -75,6 +75,7 @@
|
|||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages vim) ;xxd
|
||||
#:use-module (gnu packages webkit)
|
||||
#:use-module (gnu packages wxwidgets)
|
||||
#:use-module (gnu packages xiph)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages xorg)
|
||||
|
@ -269,6 +270,80 @@ record, edit, mix and master audio and MIDI projects. It is targeted at audio
|
|||
engineers, musicians, soundtrack editors and composers.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public audacity
|
||||
(package
|
||||
(name "audacity")
|
||||
(version "2.1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/audacity/audacity/archive"
|
||||
"/Audacity-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree
|
||||
;; versions shipping with Audacity are used for now.
|
||||
`(("wxwidgets" ,wxwidgets-gtk2)
|
||||
("gtk" ,gtk+-2)
|
||||
("alsa-lib" ,alsa-lib)
|
||||
("jack" ,jack-1)
|
||||
("expat" ,expat)
|
||||
("ffmpeg" ,ffmpeg)
|
||||
("lame" ,lame)
|
||||
("flac" ,flac)
|
||||
("libid3tag" ,libid3tag)
|
||||
("libmad" ,libmad)
|
||||
("libsbsms" ,libsbsms)
|
||||
("libsndfile" ,libsndfile)
|
||||
("soundtouch" ,soundtouch)
|
||||
("soxr" ,soxr) ;replaces libsamplerate
|
||||
("twolame" ,twolame)
|
||||
("vamp" ,vamp)
|
||||
("libvorbis" ,libvorbis)
|
||||
("lv2" ,lv2)
|
||||
("lilv" ,lilv)
|
||||
("portaudio" ,portaudio)))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("gettext" ,gettext-minimal) ;for msgfmt
|
||||
("libtool" ,libtool)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-2)
|
||||
("which" ,which)))
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
(let ((libid3tag (assoc-ref %build-inputs "libid3tag"))
|
||||
(libmad (assoc-ref %build-inputs "libmad")))
|
||||
(list
|
||||
;; Loading FFmpeg dynamically is problematic.
|
||||
"--disable-dynamic-loading"
|
||||
;; libid3tag and libmad provide no .pc files, so pkg-config fails to
|
||||
;; find them. Force their inclusion.
|
||||
(string-append "ID3TAG_CFLAGS=-I" libid3tag "/include")
|
||||
(string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz")
|
||||
(string-append "LIBMAD_CFLAGS=-I" libmad "/include")
|
||||
(string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad")))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; FFmpeg is only detected if autoreconf runs.
|
||||
(add-before 'configure 'autoreconf
|
||||
(lambda _
|
||||
(zero? (system* "autoreconf" "-vfi")))))
|
||||
;; The test suite is not "well exercised" according to the developers,
|
||||
;; and fails with various errors. See
|
||||
;; <http://sourceforge.net/p/audacity/mailman/message/33524292/>.
|
||||
#:tests? #f))
|
||||
(home-page "http://audacity.sourceforge.net/")
|
||||
(synopsis "Software for recording and editing sounds")
|
||||
(description
|
||||
"Audacity is a multi-track audio editor designed for recording, playing
|
||||
and editing digital audio. It features digital effects and spectrum analysis
|
||||
tools.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public azr3
|
||||
(package
|
||||
(name "azr3")
|
||||
|
@ -1091,7 +1166,6 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
|
|||
("jack" ,jack-1)
|
||||
("gtkmm" ,gtkmm-2)
|
||||
("gtk+" ,gtk+-2)
|
||||
("webkitgtk/gtk+-2" ,webkitgtk/gtk+-2)
|
||||
("fftwf" ,fftwf)
|
||||
("lrdf" ,lrdf)
|
||||
("zita-resampler" ,zita-resampler)
|
||||
|
@ -1227,7 +1301,7 @@ especially for creating reverb effects. It supports impulse responses with 1,
|
|||
(define-public jack-1
|
||||
(package
|
||||
(name "jack")
|
||||
(version "0.124.1")
|
||||
(version "0.125.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1236,7 +1310,7 @@ especially for creating reverb effects. It supports impulse responses with 1,
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb"))))
|
||||
"0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("alsa-lib" ,alsa-lib)
|
||||
|
@ -1328,14 +1402,14 @@ synchronous execution of all clients, and low latency operation.")
|
|||
(define-public jalv
|
||||
(package
|
||||
(name "jalv")
|
||||
(version "1.4.6")
|
||||
(version "1.6.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.drobilla.net/jalv-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1f1hcq74n3ziw8bk97mn5a1vgw028dxikv3fchaxd430pbbhqgl9"))))
|
||||
"1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili"))))
|
||||
(build-system waf-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
|
@ -1351,8 +1425,8 @@ synchronous execution of all clients, and low latency operation.")
|
|||
`(("lv2" ,lv2)
|
||||
("lilv" ,lilv)
|
||||
("suil" ,suil)
|
||||
("gtk" ,gtk+-2)
|
||||
("gtkmm" ,gtkmm-2)
|
||||
("gtk" ,gtk+)
|
||||
("gtkmm" ,gtkmm)
|
||||
("jack" ,jack-1)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -1526,15 +1600,14 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.")
|
|||
(define-public lilv
|
||||
(package
|
||||
(name "lilv")
|
||||
(version "0.22.0")
|
||||
(version "0.24.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.drobilla.net/lilv-"
|
||||
version
|
||||
".tar.bz2"))
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1d3ss7vv8drf1c5340lyd0gv736n2qy7sxji2nh1rw9y48hr69yd"))))
|
||||
"08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p"))))
|
||||
(build-system waf-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
|
@ -1792,6 +1865,34 @@ buffers, and audio capture.")
|
|||
and ALSA.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public qjackctl
|
||||
(package
|
||||
(name "qjackctl")
|
||||
(version "0.4.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/qjackctl/qjackctl/"
|
||||
version "/qjackctl-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dsavjfzz5bpzc80mvfs940w9f9f47cf4r9cqxnaqrl4xilsa3f5"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ; no check target
|
||||
(inputs
|
||||
`(("jack" ,jack-1)
|
||||
("qtbase" ,qtbase)
|
||||
("qtx11extras" ,qtx11extras)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("qttools" ,qttools)))
|
||||
(home-page "https://qjackctl.sourceforge.io/")
|
||||
(synopsis "Jack server control application")
|
||||
(description "Control a Jack server. Allows you to plug various sources
|
||||
into various outputs and to start, stop and configure jackd")
|
||||
(license license:gpl2+)))
|
||||
|
||||
|
||||
(define-public raul
|
||||
(package
|
||||
(name "raul")
|
||||
|
@ -1918,15 +2019,14 @@ input/output.")
|
|||
(define-public sratom
|
||||
(package
|
||||
(name "sratom")
|
||||
(version "0.4.6")
|
||||
(version "0.6.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.drobilla.net/sratom-"
|
||||
version
|
||||
".tar.bz2"))
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"080jjiyxjnj7hf25844hd9rb01grvzz1rk8mxcdnakywmspbxfd4"))))
|
||||
"0hrxd9i66s06bpn6i3s9ka95134g3sm8yscmif7qgdzhyjqw42j4"))))
|
||||
(build-system waf-build-system)
|
||||
(arguments `(#:tests? #f)) ; no check target
|
||||
(inputs
|
||||
|
@ -1945,15 +2045,14 @@ the Turtle syntax.")
|
|||
(define-public suil
|
||||
(package
|
||||
(name "suil")
|
||||
(version "0.8.2")
|
||||
(version "0.8.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.drobilla.net/suil-"
|
||||
version
|
||||
".tar.bz2"))
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq"))))
|
||||
"1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf"))))
|
||||
(build-system waf-build-system)
|
||||
(arguments `(#:tests? #f)) ; no check target
|
||||
(inputs
|
||||
|
@ -2278,7 +2377,7 @@ can play and record audio files.")
|
|||
(define-public soxr
|
||||
(package
|
||||
(name "soxr")
|
||||
(version "0.1.1")
|
||||
(version "0.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2286,7 +2385,7 @@ can play and record audio files.")
|
|||
(string-append "mirror://sourceforge/soxr/soxr-" version
|
||||
"-Source.tar.xz"))
|
||||
(sha256
|
||||
(base32 "1hmadwqfpg15vhwq9pa1sl5xslibrjpk6hpq2s9hfmx1s5l6ihfw"))))
|
||||
(base32 "0xf2w3piwz9gfr1xqyrj4k685q5dy53kq3igv663i4f4y4sg9rjl"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments '(#:tests? #f)) ;no 'check' target
|
||||
(home-page "https://sourceforge.net/p/soxr/wiki/Home/")
|
||||
|
@ -2332,7 +2431,7 @@ portions of LAME.")
|
|||
(define-public portaudio
|
||||
(package
|
||||
(name "portaudio")
|
||||
(version "19.20140130")
|
||||
(version "190600.20161030")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2341,7 +2440,7 @@ portions of LAME.")
|
|||
(string-map (lambda (c) (if (char=? c #\.) #\_ c)) version)
|
||||
".tgz"))
|
||||
(sha256
|
||||
(base32 "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g"))
|
||||
(base32 "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm"))
|
||||
(patches (search-patches "portaudio-audacity-compat.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
|
@ -2374,14 +2473,15 @@ interface.")
|
|||
(define-public qsynth
|
||||
(package
|
||||
(name "qsynth")
|
||||
(version "0.4.3")
|
||||
(version "0.4.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/qsynth/qsynth/" version
|
||||
"/qsynth-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1j5hm99fjrnaw8wbmlh4qixkv3rw5dl429mp1ag7js2ydrx0j9yy"))))
|
||||
(base32
|
||||
"0qhfnikx3xcllkvs60kj6vcf2rwwzh31y41qkk6kwfhzgd219y8f"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no "check" phase
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -30,14 +30,14 @@
|
|||
(define-public augeas
|
||||
(package
|
||||
(name "augeas")
|
||||
(version "1.4.0")
|
||||
(version "1.8.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.augeas.net/augeas-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0c2vncn0afmgwggnqa5s5z7m3zbcc66bi8v9m1h9w0i9q9xax7v5"))))
|
||||
"1iac5lwi1q10r343ii9v5p2fdplvh06yv9svsi8zz6cd2c2fjp2i"))))
|
||||
(build-system gnu-build-system)
|
||||
;; Marked as "required" in augeas.pc
|
||||
(propagated-inputs
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
|
||||
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015, 2017 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2017 ng0 <ng0@libertad.pw>
|
||||
;;;
|
||||
|
@ -92,6 +92,35 @@ know anything about Autoconf or M4.")
|
|||
(base32
|
||||
"0j3jdjpf5ly39dlp0bg70h72nzqr059k0x8iqxvaxf106chpgn9j"))))))
|
||||
|
||||
(define-public autoconf-2.13
|
||||
;; GNU IceCat 52.x requires autoconf-2.13 to build!
|
||||
(package (inherit autoconf)
|
||||
(version "2.13")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/autoconf/autoconf-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh"))))
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
#:phases
|
||||
;; The 'configure' script in autoconf-2.13 can't cope with "SHELL=" and
|
||||
;; "CONFIG_SHELL=" arguments, so we set them as environment variables
|
||||
;; and pass a simplified set of arguments.
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key build inputs outputs #:allow-other-keys)
|
||||
(let ((bash (which "bash"))
|
||||
(out (assoc-ref outputs "out")))
|
||||
(setenv "CONFIG_SHELL" bash)
|
||||
(setenv "SHELL" bash)
|
||||
(zero? (system* bash "./configure"
|
||||
(string-append "--prefix=" out)
|
||||
(string-append "--build=" build)))))))))))
|
||||
|
||||
|
||||
(define* (autoconf-wrapper #:optional (autoconf autoconf))
|
||||
"Return an wrapper around AUTOCONF that generates `configure' scripts that
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.10.0-gnu Kernel Configuration
|
||||
# Linux/x86 4.11.0-gnu Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
|
@ -38,7 +38,6 @@ CONFIG_HAVE_INTEL_TXT=y
|
|||
CONFIG_X86_32_SMP=y
|
||||
CONFIG_ARCH_SUPPORTS_UPROBES=y
|
||||
CONFIG_FIX_EARLYCON_MEM=y
|
||||
CONFIG_DEBUG_RODATA=y
|
||||
CONFIG_PGTABLE_LEVELS=3
|
||||
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
|
||||
CONFIG_IRQ_WORK=y
|
||||
|
@ -134,12 +133,11 @@ CONFIG_SRCU=y
|
|||
# CONFIG_TASKS_RCU is not set
|
||||
CONFIG_RCU_STALL_COMMON=y
|
||||
# CONFIG_TREE_RCU_TRACE is not set
|
||||
# CONFIG_RCU_EXPEDITE_BOOT is not set
|
||||
CONFIG_BUILD_BIN2C=y
|
||||
# CONFIG_IKCONFIG is not set
|
||||
CONFIG_LOG_BUF_SHIFT=17
|
||||
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
|
||||
CONFIG_NMI_LOG_BUF_SHIFT=13
|
||||
CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
|
||||
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
|
||||
CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
|
||||
CONFIG_CGROUPS=y
|
||||
|
@ -155,6 +153,7 @@ CONFIG_FAIR_GROUP_SCHED=y
|
|||
CONFIG_CFS_BANDWIDTH=y
|
||||
# CONFIG_RT_GROUP_SCHED is not set
|
||||
CONFIG_CGROUP_PIDS=y
|
||||
# CONFIG_CGROUP_RDMA is not set
|
||||
CONFIG_CGROUP_FREEZER=y
|
||||
CONFIG_CGROUP_HUGETLB=y
|
||||
CONFIG_CPUSETS=y
|
||||
|
@ -223,6 +222,7 @@ CONFIG_PCI_QUIRKS=y
|
|||
CONFIG_MEMBARRIER=y
|
||||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_HAVE_PERF_EVENTS=y
|
||||
# CONFIG_PC104 is not set
|
||||
|
||||
#
|
||||
# Kernel Performance Events And Counters
|
||||
|
@ -231,6 +231,7 @@ CONFIG_PERF_EVENTS=y
|
|||
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
|
||||
CONFIG_VM_EVENT_COUNTERS=y
|
||||
CONFIG_SLUB_DEBUG=y
|
||||
# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
|
||||
# CONFIG_COMPAT_BRK is not set
|
||||
# CONFIG_SLAB is not set
|
||||
CONFIG_SLUB=y
|
||||
|
@ -250,7 +251,7 @@ CONFIG_JUMP_LABEL=y
|
|||
# CONFIG_STATIC_KEYS_SELFTEST is not set
|
||||
CONFIG_OPTPROBES=y
|
||||
CONFIG_KPROBES_ON_FTRACE=y
|
||||
CONFIG_UPROBES=y
|
||||
# CONFIG_UPROBES is not set
|
||||
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
|
||||
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
|
||||
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
|
||||
|
@ -265,6 +266,7 @@ CONFIG_HAVE_NMI=y
|
|||
CONFIG_HAVE_ARCH_TRACEHOOK=y
|
||||
CONFIG_HAVE_DMA_CONTIGUOUS=y
|
||||
CONFIG_GENERIC_SMP_IDLE_THREAD=y
|
||||
CONFIG_ARCH_HAS_SET_MEMORY=y
|
||||
CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
|
||||
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
|
||||
CONFIG_HAVE_CLK=y
|
||||
|
@ -287,6 +289,7 @@ CONFIG_HAVE_GCC_PLUGINS=y
|
|||
CONFIG_GCC_PLUGINS=y
|
||||
# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
|
||||
# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
|
||||
# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
|
||||
CONFIG_HAVE_CC_STACKPROTECTOR=y
|
||||
CONFIG_CC_STACKPROTECTOR=y
|
||||
# CONFIG_CC_STACKPROTECTOR_NONE is not set
|
||||
|
@ -309,6 +312,12 @@ CONFIG_OLD_SIGSUSPEND3=y
|
|||
CONFIG_OLD_SIGACTION=y
|
||||
# CONFIG_CPU_NO_EFFICIENT_FFS is not set
|
||||
# CONFIG_HAVE_ARCH_VMAP_STACK is not set
|
||||
# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
|
||||
# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
|
||||
CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
|
||||
CONFIG_STRICT_KERNEL_RWX=y
|
||||
CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
|
||||
CONFIG_STRICT_MODULE_RWX=y
|
||||
|
||||
#
|
||||
# GCOV-based kernel profiling
|
||||
|
@ -330,6 +339,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
|
|||
CONFIG_MODULES_TREE_LOOKUP=y
|
||||
CONFIG_BLOCK=y
|
||||
CONFIG_LBDAF=y
|
||||
CONFIG_BLK_SCSI_REQUEST=y
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
CONFIG_BLK_DEV_BSGLIB=y
|
||||
CONFIG_BLK_DEV_INTEGRITY=y
|
||||
|
@ -339,6 +349,8 @@ CONFIG_BLK_CMDLINE_PARSER=y
|
|||
CONFIG_BLK_WBT=y
|
||||
# CONFIG_BLK_WBT_SQ is not set
|
||||
CONFIG_BLK_WBT_MQ=y
|
||||
CONFIG_BLK_DEBUG_FS=y
|
||||
# CONFIG_BLK_SED_OPAL is not set
|
||||
|
||||
#
|
||||
# Partition Types
|
||||
|
@ -365,6 +377,7 @@ CONFIG_EFI_PARTITION=y
|
|||
CONFIG_SYSV68_PARTITION=y
|
||||
CONFIG_CMDLINE_PARTITION=y
|
||||
CONFIG_BLK_MQ_PCI=y
|
||||
CONFIG_BLK_MQ_VIRTIO=y
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
|
@ -377,6 +390,7 @@ CONFIG_DEFAULT_DEADLINE=y
|
|||
# CONFIG_DEFAULT_CFQ is not set
|
||||
# CONFIG_DEFAULT_NOOP is not set
|
||||
CONFIG_DEFAULT_IOSCHED="deadline"
|
||||
CONFIG_MQ_IOSCHED_DEADLINE=m
|
||||
CONFIG_PREEMPT_NOTIFIERS=y
|
||||
CONFIG_PADATA=y
|
||||
CONFIG_ASN1=y
|
||||
|
@ -428,6 +442,7 @@ CONFIG_XEN_DOM0=y
|
|||
CONFIG_XEN_PVHVM=y
|
||||
CONFIG_XEN_SAVE_RESTORE=y
|
||||
# CONFIG_XEN_DEBUG_FS is not set
|
||||
CONFIG_XEN_PVH=y
|
||||
CONFIG_KVM_GUEST=y
|
||||
CONFIG_KVM_DEBUG_FS=y
|
||||
# CONFIG_LGUEST_GUEST is not set
|
||||
|
@ -720,7 +735,6 @@ CONFIG_CPU_FREQ=y
|
|||
CONFIG_CPU_FREQ_GOV_ATTR_SET=y
|
||||
CONFIG_CPU_FREQ_GOV_COMMON=y
|
||||
CONFIG_CPU_FREQ_STAT=y
|
||||
CONFIG_CPU_FREQ_STAT_DETAILS=y
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
|
||||
|
@ -796,6 +810,7 @@ CONFIG_PCIEASPM=y
|
|||
CONFIG_PCIEASPM_DEBUG=y
|
||||
CONFIG_PCIEASPM_DEFAULT=y
|
||||
# CONFIG_PCIEASPM_POWERSAVE is not set
|
||||
# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
|
||||
# CONFIG_PCIEASPM_PERFORMANCE is not set
|
||||
CONFIG_PCIE_PME=y
|
||||
CONFIG_PCIE_DPC=y
|
||||
|
@ -825,9 +840,13 @@ CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
|
|||
CONFIG_HOTPLUG_PCI_SHPC=m
|
||||
|
||||
#
|
||||
# PCI host controller drivers
|
||||
# DesignWare PCI Core Support
|
||||
#
|
||||
# CONFIG_PCIE_DW_PLAT is not set
|
||||
|
||||
#
|
||||
# PCI host controller drivers
|
||||
#
|
||||
# CONFIG_ISA_BUS is not set
|
||||
CONFIG_ISA_DMA_API=y
|
||||
CONFIG_ISA=y
|
||||
|
@ -895,7 +914,6 @@ CONFIG_BINFMT_MISC=m
|
|||
CONFIG_COREDUMP=y
|
||||
CONFIG_COMPAT_32=y
|
||||
CONFIG_HAVE_ATOMIC_IOMAP=y
|
||||
CONFIG_PMC_ATOM=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_NET_INGRESS=y
|
||||
CONFIG_NET_EGRESS=y
|
||||
|
@ -908,6 +926,7 @@ CONFIG_PACKET_DIAG=m
|
|||
CONFIG_UNIX=y
|
||||
CONFIG_UNIX_DIAG=m
|
||||
CONFIG_XFRM=y
|
||||
CONFIG_XFRM_OFFLOAD=y
|
||||
CONFIG_XFRM_ALGO=m
|
||||
CONFIG_XFRM_USER=m
|
||||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
|
@ -916,6 +935,7 @@ CONFIG_XFRM_STATISTICS=y
|
|||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=m
|
||||
# CONFIG_NET_KEY_MIGRATE is not set
|
||||
# CONFIG_SMC is not set
|
||||
CONFIG_INET=y
|
||||
CONFIG_IP_MULTICAST=y
|
||||
CONFIG_IP_ADVANCED_ROUTER=y
|
||||
|
@ -944,6 +964,7 @@ CONFIG_NET_FOU=m
|
|||
CONFIG_NET_FOU_IP_TUNNELS=y
|
||||
CONFIG_INET_AH=m
|
||||
CONFIG_INET_ESP=m
|
||||
CONFIG_INET_ESP_OFFLOAD=m
|
||||
CONFIG_INET_IPCOMP=m
|
||||
CONFIG_INET_XFRM_TUNNEL=m
|
||||
CONFIG_INET_TUNNEL=m
|
||||
|
@ -982,6 +1003,7 @@ CONFIG_IPV6_ROUTE_INFO=y
|
|||
# CONFIG_IPV6_OPTIMISTIC_DAD is not set
|
||||
CONFIG_INET6_AH=m
|
||||
CONFIG_INET6_ESP=m
|
||||
CONFIG_INET6_ESP_OFFLOAD=m
|
||||
CONFIG_INET6_IPCOMP=m
|
||||
CONFIG_IPV6_MIP6=m
|
||||
CONFIG_IPV6_ILA=m
|
||||
|
@ -1075,6 +1097,7 @@ CONFIG_NFT_NUMGEN=m
|
|||
CONFIG_NFT_CT=m
|
||||
CONFIG_NFT_SET_RBTREE=m
|
||||
CONFIG_NFT_SET_HASH=m
|
||||
CONFIG_NFT_SET_BITMAP=m
|
||||
CONFIG_NFT_COUNTER=m
|
||||
CONFIG_NFT_LOG=m
|
||||
CONFIG_NFT_LIMIT=m
|
||||
|
@ -1407,6 +1430,12 @@ CONFIG_BRIDGE=m
|
|||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
CONFIG_BRIDGE_VLAN_FILTERING=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
CONFIG_NET_DSA=m
|
||||
CONFIG_NET_DSA_TAG_BRCM=y
|
||||
CONFIG_NET_DSA_TAG_DSA=y
|
||||
CONFIG_NET_DSA_TAG_EDSA=y
|
||||
CONFIG_NET_DSA_TAG_TRAILER=y
|
||||
CONFIG_NET_DSA_TAG_QCA=y
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VLAN_8021Q_GVRP=y
|
||||
CONFIG_VLAN_8021Q_MVRP=y
|
||||
|
@ -1511,6 +1540,7 @@ CONFIG_NET_ACT_POLICE=m
|
|||
CONFIG_NET_ACT_GACT=m
|
||||
CONFIG_GACT_PROB=y
|
||||
CONFIG_NET_ACT_MIRRED=m
|
||||
CONFIG_NET_ACT_SAMPLE=m
|
||||
CONFIG_NET_ACT_IPT=m
|
||||
CONFIG_NET_ACT_NAT=m
|
||||
CONFIG_NET_ACT_PEDIT=m
|
||||
|
@ -1552,7 +1582,7 @@ CONFIG_NET_MPLS_GSO=m
|
|||
CONFIG_MPLS_ROUTING=m
|
||||
CONFIG_MPLS_IPTUNNEL=m
|
||||
CONFIG_HSR=m
|
||||
# CONFIG_NET_SWITCHDEV is not set
|
||||
CONFIG_NET_SWITCHDEV=y
|
||||
CONFIG_NET_L3_MASTER_DEV=y
|
||||
CONFIG_NET_NCSI=y
|
||||
CONFIG_RPS=y
|
||||
|
@ -1800,7 +1830,6 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
|
|||
CONFIG_RFKILL=y
|
||||
CONFIG_RFKILL_LEDS=y
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL_REGULATOR=m
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_NET_9P=m
|
||||
CONFIG_NET_9P_VIRTIO=m
|
||||
|
@ -1855,9 +1884,12 @@ CONFIG_NFC_NXP_NCI_I2C=m
|
|||
CONFIG_NFC_S3FWRN5=m
|
||||
CONFIG_NFC_S3FWRN5_I2C=m
|
||||
CONFIG_NFC_ST95HF=m
|
||||
CONFIG_PSAMPLE=m
|
||||
CONFIG_NET_IFE=m
|
||||
CONFIG_LWTUNNEL=y
|
||||
CONFIG_LWTUNNEL_BPF=y
|
||||
CONFIG_DST_CACHE=y
|
||||
CONFIG_GRO_CELLS=y
|
||||
CONFIG_NET_DEVLINK=m
|
||||
CONFIG_MAY_USE_DEVLINK=m
|
||||
|
||||
|
@ -2024,7 +2056,6 @@ CONFIG_MTD_NAND_CAFE=m
|
|||
CONFIG_MTD_NAND_CS553X=m
|
||||
CONFIG_MTD_NAND_NANDSIM=m
|
||||
CONFIG_MTD_NAND_PLATFORM=m
|
||||
CONFIG_MTD_NAND_OXNAS=m
|
||||
CONFIG_MTD_NAND_HISI504=m
|
||||
CONFIG_MTD_NAND_MTK=m
|
||||
CONFIG_MTD_ONENAND=m
|
||||
|
@ -2041,6 +2072,8 @@ CONFIG_MTD_QINFO_PROBE=m
|
|||
CONFIG_MTD_SPI_NOR=m
|
||||
CONFIG_MTD_MT81xx_NOR=m
|
||||
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
|
||||
CONFIG_SPI_INTEL_SPI=m
|
||||
CONFIG_SPI_INTEL_SPI_PLATFORM=m
|
||||
CONFIG_MTD_UBI=m
|
||||
CONFIG_MTD_UBI_WL_THRESHOLD=4096
|
||||
CONFIG_MTD_UBI_BEB_LIMIT=20
|
||||
|
@ -2128,6 +2161,7 @@ CONFIG_ATA_OVER_ETH=m
|
|||
CONFIG_XEN_BLKDEV_FRONTEND=y
|
||||
CONFIG_XEN_BLKDEV_BACKEND=m
|
||||
CONFIG_VIRTIO_BLK=y
|
||||
# CONFIG_VIRTIO_BLK_SCSI is not set
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
CONFIG_BLK_DEV_RSXX=m
|
||||
|
@ -2191,6 +2225,7 @@ CONFIG_EEPROM_LEGACY=m
|
|||
CONFIG_EEPROM_MAX6875=m
|
||||
CONFIG_EEPROM_93CX6=m
|
||||
CONFIG_EEPROM_93XX46=m
|
||||
CONFIG_EEPROM_IDT_89HPESX=m
|
||||
CONFIG_CB710_CORE=m
|
||||
# CONFIG_CB710_DEBUG is not set
|
||||
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
|
||||
|
@ -2384,6 +2419,7 @@ CONFIG_TCM_QLA2XXX=m
|
|||
# CONFIG_TCM_QLA2XXX_DEBUG is not set
|
||||
CONFIG_SCSI_QLA_ISCSI=m
|
||||
CONFIG_QEDI=m
|
||||
CONFIG_QEDF=m
|
||||
CONFIG_SCSI_LPFC=m
|
||||
# CONFIG_SCSI_LPFC_DEBUG_FS is not set
|
||||
CONFIG_SCSI_SIM710=m
|
||||
|
@ -2607,6 +2643,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m
|
|||
CONFIG_MACVLAN=m
|
||||
CONFIG_MACVTAP=m
|
||||
CONFIG_IPVLAN=m
|
||||
CONFIG_IPVTAP=m
|
||||
CONFIG_VXLAN=m
|
||||
CONFIG_GENEVE=m
|
||||
CONFIG_GTP=m
|
||||
|
@ -2620,6 +2657,7 @@ CONFIG_RIONET=m
|
|||
CONFIG_RIONET_TX_SIZE=128
|
||||
CONFIG_RIONET_RX_SIZE=128
|
||||
CONFIG_TUN=y
|
||||
CONFIG_TAP=m
|
||||
# CONFIG_TUN_VNET_CROSS_LE is not set
|
||||
CONFIG_VETH=m
|
||||
CONFIG_VIRTIO_NET=y
|
||||
|
@ -2681,6 +2719,16 @@ CONFIG_CAIF_VIRTIO=m
|
|||
#
|
||||
# Distributed Switch Architecture drivers
|
||||
#
|
||||
CONFIG_NET_DSA_MV88E6060=m
|
||||
CONFIG_NET_DSA_BCM_SF2=m
|
||||
CONFIG_B53=m
|
||||
CONFIG_B53_SPI_DRIVER=m
|
||||
CONFIG_B53_MDIO_DRIVER=m
|
||||
CONFIG_B53_MMAP_DRIVER=m
|
||||
CONFIG_B53_SRAB_DRIVER=m
|
||||
CONFIG_NET_DSA_MV88E6XXX=m
|
||||
CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
|
||||
CONFIG_NET_DSA_QCA8K=m
|
||||
CONFIG_ETHERNET=y
|
||||
CONFIG_MDIO=m
|
||||
CONFIG_NET_VENDOR_3COM=y
|
||||
|
@ -2711,6 +2759,7 @@ CONFIG_NI65=m
|
|||
CONFIG_AMD_XGBE=m
|
||||
# CONFIG_AMD_XGBE_DCB is not set
|
||||
CONFIG_AMD_XGBE_HAVE_ECC=y
|
||||
CONFIG_NET_VENDOR_AQUANTIA=y
|
||||
CONFIG_NET_VENDOR_ARC=y
|
||||
CONFIG_NET_VENDOR_ATHEROS=y
|
||||
CONFIG_ATL2=m
|
||||
|
@ -2826,6 +2875,10 @@ CONFIG_MLXSW_CORE_HWMON=y
|
|||
CONFIG_MLXSW_CORE_THERMAL=y
|
||||
CONFIG_MLXSW_PCI=m
|
||||
CONFIG_MLXSW_I2C=m
|
||||
CONFIG_MLXSW_SWITCHIB=m
|
||||
CONFIG_MLXSW_SWITCHX2=m
|
||||
CONFIG_MLXSW_SPECTRUM=m
|
||||
CONFIG_MLXSW_SPECTRUM_DCB=y
|
||||
CONFIG_MLXSW_MINIMAL=m
|
||||
CONFIG_NET_VENDOR_MICREL=y
|
||||
CONFIG_KS8842=m
|
||||
|
@ -2843,8 +2896,8 @@ CONFIG_NET_VENDOR_NATSEMI=y
|
|||
CONFIG_NATSEMI=m
|
||||
CONFIG_NS83820=m
|
||||
CONFIG_NET_VENDOR_NETRONOME=y
|
||||
CONFIG_NFP_NETVF=m
|
||||
# CONFIG_NFP_NET_DEBUG is not set
|
||||
CONFIG_NFP=m
|
||||
# CONFIG_NFP_DEBUG is not set
|
||||
CONFIG_NET_VENDOR_8390=y
|
||||
CONFIG_PCMCIA_AXNET=m
|
||||
CONFIG_NE2000=m
|
||||
|
@ -2873,6 +2926,7 @@ CONFIG_QED_LL2=y
|
|||
CONFIG_QED_SRIOV=y
|
||||
CONFIG_QEDE=m
|
||||
CONFIG_QED_ISCSI=y
|
||||
CONFIG_QED_FCOE=y
|
||||
CONFIG_NET_VENDOR_QUALCOMM=y
|
||||
CONFIG_QCOM_EMAC=m
|
||||
CONFIG_NET_VENDOR_REALTEK=y
|
||||
|
@ -2888,6 +2942,7 @@ CONFIG_NET_VENDOR_RENESAS=y
|
|||
CONFIG_NET_VENDOR_RDC=y
|
||||
CONFIG_R6040=m
|
||||
CONFIG_NET_VENDOR_ROCKER=y
|
||||
CONFIG_ROCKER=m
|
||||
CONFIG_NET_VENDOR_SAMSUNG=y
|
||||
CONFIG_SXGBE_ETH=m
|
||||
CONFIG_NET_VENDOR_SEEQ=y
|
||||
|
@ -2921,7 +2976,6 @@ CONFIG_HAPPYMEAL=m
|
|||
CONFIG_SUNGEM=m
|
||||
CONFIG_CASSINI=m
|
||||
CONFIG_NIU=m
|
||||
CONFIG_NET_VENDOR_SYNOPSYS=y
|
||||
CONFIG_NET_VENDOR_TEHUTI=y
|
||||
CONFIG_TEHUTI=m
|
||||
CONFIG_NET_VENDOR_TI=y
|
||||
|
@ -3064,6 +3118,7 @@ CONFIG_ATH5K=m
|
|||
CONFIG_ATH5K_PCI=y
|
||||
CONFIG_ATH9K_HW=m
|
||||
CONFIG_ATH9K_COMMON=m
|
||||
CONFIG_ATH9K_COMMON_DEBUG=y
|
||||
CONFIG_ATH9K_BTCOEX_SUPPORT=y
|
||||
CONFIG_ATH9K=m
|
||||
CONFIG_ATH9K_PCI=y
|
||||
|
@ -3491,7 +3546,6 @@ CONFIG_MISDN_ISAR=m
|
|||
CONFIG_ISDN_HDLC=m
|
||||
CONFIG_NVM=y
|
||||
# CONFIG_NVM_DEBUG is not set
|
||||
CONFIG_NVM_GENNVM=m
|
||||
CONFIG_NVM_RRPC=m
|
||||
|
||||
#
|
||||
|
@ -3542,6 +3596,7 @@ CONFIG_KEYBOARD_OPENCORES=m
|
|||
CONFIG_KEYBOARD_SAMSUNG=m
|
||||
CONFIG_KEYBOARD_STOWAWAY=m
|
||||
CONFIG_KEYBOARD_SUNKBD=m
|
||||
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
|
||||
CONFIG_KEYBOARD_TWL4030=m
|
||||
CONFIG_KEYBOARD_XTKBD=m
|
||||
CONFIG_KEYBOARD_CROS_EC=m
|
||||
|
@ -3652,7 +3707,6 @@ CONFIG_TOUCHSCREEN_MMS114=m
|
|||
CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
|
||||
CONFIG_TOUCHSCREEN_MTOUCH=m
|
||||
CONFIG_TOUCHSCREEN_INEXIO=m
|
||||
CONFIG_TOUCHSCREEN_INTEL_MID=m
|
||||
CONFIG_TOUCHSCREEN_MK712=m
|
||||
CONFIG_TOUCHSCREEN_HTCPEN=m
|
||||
CONFIG_TOUCHSCREEN_PENMOUNT=m
|
||||
|
@ -3703,6 +3757,7 @@ CONFIG_TOUCHSCREEN_SUR40=m
|
|||
CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
|
||||
CONFIG_TOUCHSCREEN_SX8654=m
|
||||
CONFIG_TOUCHSCREEN_TPS6507X=m
|
||||
CONFIG_TOUCHSCREEN_ZET6223=m
|
||||
CONFIG_TOUCHSCREEN_ZFORCE=m
|
||||
CONFIG_TOUCHSCREEN_ROHM_BU21023=m
|
||||
CONFIG_INPUT_MISC=y
|
||||
|
@ -3720,7 +3775,6 @@ CONFIG_INPUT_MAX8925_ONKEY=m
|
|||
CONFIG_INPUT_MAX8997_HAPTIC=m
|
||||
CONFIG_INPUT_MC13783_PWRBUTTON=m
|
||||
CONFIG_INPUT_MMA8450=m
|
||||
CONFIG_INPUT_MPU3050=m
|
||||
CONFIG_INPUT_APANEL=m
|
||||
CONFIG_INPUT_GP2A=m
|
||||
CONFIG_INPUT_GPIO_BEEPER=m
|
||||
|
@ -3769,7 +3823,8 @@ CONFIG_RMI4_CORE=m
|
|||
CONFIG_RMI4_I2C=m
|
||||
CONFIG_RMI4_SPI=m
|
||||
CONFIG_RMI4_SMB=m
|
||||
# CONFIG_RMI4_F03 is not set
|
||||
CONFIG_RMI4_F03=y
|
||||
CONFIG_RMI4_F03_SERIO=m
|
||||
CONFIG_RMI4_2D_SENSOR=y
|
||||
CONFIG_RMI4_F11=y
|
||||
CONFIG_RMI4_F12=y
|
||||
|
@ -3843,6 +3898,7 @@ CONFIG_SERIAL_8250_PNP=y
|
|||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_SERIAL_8250_DMA=y
|
||||
CONFIG_SERIAL_8250_PCI=y
|
||||
CONFIG_SERIAL_8250_EXAR=m
|
||||
CONFIG_SERIAL_8250_CS=m
|
||||
CONFIG_SERIAL_8250_NR_UARTS=48
|
||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=32
|
||||
|
@ -3893,6 +3949,8 @@ CONFIG_SERIAL_RP2=m
|
|||
CONFIG_SERIAL_RP2_NR_UARTS=32
|
||||
CONFIG_SERIAL_FSL_LPUART=m
|
||||
CONFIG_SERIAL_MEN_Z135=m
|
||||
CONFIG_SERIAL_DEV_BUS=y
|
||||
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
|
||||
CONFIG_TTY_PRINTK=y
|
||||
CONFIG_PRINTER=m
|
||||
# CONFIG_LP_CONSOLE is not set
|
||||
|
@ -4133,6 +4191,7 @@ CONFIG_PTP_1588_CLOCK=m
|
|||
# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
|
||||
#
|
||||
CONFIG_PTP_1588_CLOCK_PCH=m
|
||||
CONFIG_PTP_1588_CLOCK_KVM=m
|
||||
CONFIG_PINCTRL=y
|
||||
|
||||
#
|
||||
|
@ -4149,6 +4208,7 @@ CONFIG_PINCTRL_CHERRYVIEW=m
|
|||
CONFIG_PINCTRL_MERRIFIELD=m
|
||||
CONFIG_PINCTRL_INTEL=m
|
||||
CONFIG_PINCTRL_BROXTON=m
|
||||
CONFIG_PINCTRL_GEMINILAKE=m
|
||||
CONFIG_PINCTRL_SUNRISEPOINT=m
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_GPIO_ACPI=y
|
||||
|
@ -4164,6 +4224,7 @@ CONFIG_GPIO_MAX730X=m
|
|||
CONFIG_GPIO_AMDPT=m
|
||||
CONFIG_GPIO_AXP209=m
|
||||
CONFIG_GPIO_DWAPB=m
|
||||
CONFIG_GPIO_EXAR=m
|
||||
CONFIG_GPIO_GENERIC_PLATFORM=m
|
||||
CONFIG_GPIO_ICH=m
|
||||
CONFIG_GPIO_LYNXPOINT=y
|
||||
|
@ -4234,6 +4295,7 @@ CONFIG_GPIO_INTEL_MID=y
|
|||
CONFIG_GPIO_MERRIFIELD=m
|
||||
CONFIG_GPIO_ML_IOH=m
|
||||
CONFIG_GPIO_PCH=m
|
||||
CONFIG_GPIO_PCI_IDIO_16=m
|
||||
CONFIG_GPIO_RDC321X=m
|
||||
|
||||
#
|
||||
|
@ -4268,6 +4330,7 @@ CONFIG_W1_MASTER_GPIO=m
|
|||
#
|
||||
CONFIG_W1_SLAVE_THERM=m
|
||||
CONFIG_W1_SLAVE_SMEM=m
|
||||
CONFIG_W1_SLAVE_DS2405=m
|
||||
CONFIG_W1_SLAVE_DS2408=m
|
||||
CONFIG_W1_SLAVE_DS2408_READBACK=y
|
||||
CONFIG_W1_SLAVE_DS2413=m
|
||||
|
@ -4299,6 +4362,7 @@ CONFIG_BATTERY_DS2780=m
|
|||
CONFIG_BATTERY_DS2781=m
|
||||
CONFIG_BATTERY_DS2782=m
|
||||
CONFIG_BATTERY_SBS=m
|
||||
CONFIG_CHARGER_SBS=m
|
||||
CONFIG_BATTERY_BQ27XXX=m
|
||||
CONFIG_BATTERY_BQ27XXX_I2C=m
|
||||
CONFIG_BATTERY_DA9030=m
|
||||
|
@ -4312,7 +4376,6 @@ CONFIG_BATTERY_MAX17042=m
|
|||
CONFIG_BATTERY_TWL4030_MADC=m
|
||||
CONFIG_CHARGER_88PM860X=m
|
||||
CONFIG_CHARGER_PCF50633=m
|
||||
CONFIG_BATTERY_INTEL_MID=m
|
||||
CONFIG_BATTERY_RX51=m
|
||||
CONFIG_CHARGER_ISP1704=m
|
||||
CONFIG_CHARGER_MAX8903=m
|
||||
|
@ -4473,6 +4536,7 @@ CONFIG_SENSORS_SMSC47B397=m
|
|||
CONFIG_SENSORS_SCH56XX_COMMON=m
|
||||
CONFIG_SENSORS_SCH5627=m
|
||||
CONFIG_SENSORS_SCH5636=m
|
||||
CONFIG_SENSORS_STTS751=m
|
||||
CONFIG_SENSORS_SMM665=m
|
||||
CONFIG_SENSORS_ADC128D818=m
|
||||
CONFIG_SENSORS_ADS1015=m
|
||||
|
@ -4605,6 +4669,7 @@ CONFIG_MACHZ_WDT=m
|
|||
CONFIG_SBC_EPX_C3_WATCHDOG=m
|
||||
CONFIG_INTEL_MEI_WDT=m
|
||||
CONFIG_NI903X_WDT=m
|
||||
CONFIG_NIC7018_WDT=m
|
||||
CONFIG_MEN_A21_WDT=m
|
||||
CONFIG_XEN_WDT=m
|
||||
|
||||
|
@ -4931,6 +4996,7 @@ CONFIG_IR_ITE_CIR=m
|
|||
CONFIG_IR_FINTEK=m
|
||||
CONFIG_IR_NUVOTON=m
|
||||
CONFIG_IR_REDRAT3=m
|
||||
CONFIG_IR_SPI=m
|
||||
CONFIG_IR_STREAMZAP=m
|
||||
CONFIG_IR_WINBOND_CIR=m
|
||||
CONFIG_IR_IGORPLUGUSB=m
|
||||
|
@ -5016,7 +5082,6 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
|
|||
CONFIG_VIDEO_HDPVR=m
|
||||
CONFIG_VIDEO_USBVISION=m
|
||||
CONFIG_VIDEO_STK1160_COMMON=m
|
||||
CONFIG_VIDEO_STK1160_AC97=y
|
||||
CONFIG_VIDEO_STK1160=m
|
||||
CONFIG_VIDEO_GO7007=m
|
||||
CONFIG_VIDEO_GO7007_USB=m
|
||||
|
@ -5081,6 +5146,7 @@ CONFIG_DVB_USB_LME2510=m
|
|||
CONFIG_DVB_USB_MXL111SF=m
|
||||
CONFIG_DVB_USB_RTL28XXU=m
|
||||
CONFIG_DVB_USB_DVBSKY=m
|
||||
CONFIG_DVB_USB_ZD1301=m
|
||||
CONFIG_DVB_TTUSB_BUDGET=m
|
||||
CONFIG_DVB_TTUSB_DEC=m
|
||||
CONFIG_SMS_USB_DRV=m
|
||||
|
@ -5131,6 +5197,7 @@ CONFIG_VIDEO_ZORAN_AVS6EYES=m
|
|||
# Media capture/analog TV support
|
||||
#
|
||||
CONFIG_VIDEO_IVTV=m
|
||||
# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
|
||||
CONFIG_VIDEO_IVTV_ALSA=m
|
||||
CONFIG_VIDEO_FB_IVTV=m
|
||||
CONFIG_VIDEO_HEXIUM_GEMINI=m
|
||||
|
@ -5496,6 +5563,7 @@ CONFIG_DVB_RTL2832=m
|
|||
CONFIG_DVB_RTL2832_SDR=m
|
||||
CONFIG_DVB_SI2168=m
|
||||
CONFIG_DVB_AS102_FE=m
|
||||
CONFIG_DVB_ZD1301_DEMOD=m
|
||||
CONFIG_DVB_GP8PSK_FE=m
|
||||
|
||||
#
|
||||
|
@ -5590,11 +5658,13 @@ CONFIG_VGA_SWITCHEROO=y
|
|||
CONFIG_DRM=m
|
||||
CONFIG_DRM_MIPI_DSI=y
|
||||
# CONFIG_DRM_DP_AUX_CHARDEV is not set
|
||||
# CONFIG_DRM_DEBUG_MM_SELFTEST is not set
|
||||
CONFIG_DRM_KMS_HELPER=m
|
||||
CONFIG_DRM_KMS_FB_HELPER=y
|
||||
CONFIG_DRM_FBDEV_EMULATION=y
|
||||
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
|
||||
CONFIG_DRM_TTM=m
|
||||
CONFIG_DRM_VM=y
|
||||
|
||||
#
|
||||
# I2C encoder or helper chips
|
||||
|
@ -5629,6 +5699,7 @@ CONFIG_DRM_I915_USERPTR=y
|
|||
#
|
||||
# CONFIG_DRM_I915_WERROR is not set
|
||||
# CONFIG_DRM_I915_DEBUG is not set
|
||||
# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
|
||||
CONFIG_DRM_VGEM=m
|
||||
CONFIG_DRM_VMWGFX=m
|
||||
CONFIG_DRM_VMWGFX_FBCON=y
|
||||
|
@ -5655,7 +5726,9 @@ CONFIG_DRM_BRIDGE=y
|
|||
#
|
||||
CONFIG_DRM_ANALOGIX_ANX78XX=m
|
||||
CONFIG_DRM_HISI_HIBMC=m
|
||||
# CONFIG_DRM_TINYDRM is not set
|
||||
# CONFIG_DRM_LEGACY is not set
|
||||
# CONFIG_DRM_LIB_RANDOM is not set
|
||||
|
||||
#
|
||||
# Frame buffer Devices
|
||||
|
@ -5673,6 +5746,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
|
|||
CONFIG_FB_SYS_FILLRECT=m
|
||||
CONFIG_FB_SYS_COPYAREA=m
|
||||
CONFIG_FB_SYS_IMAGEBLIT=m
|
||||
# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
|
||||
# CONFIG_FB_FOREIGN_ENDIAN is not set
|
||||
CONFIG_FB_SYS_FOPS=m
|
||||
CONFIG_FB_DEFERRED_IO=y
|
||||
|
@ -6091,7 +6165,7 @@ CONFIG_SND_SOC_FSL_ESAI=m
|
|||
CONFIG_SND_SOC_IMX_AUDMUX=m
|
||||
# CONFIG_SND_SOC_IMG is not set
|
||||
CONFIG_SND_MFLD_MACHINE=m
|
||||
CONFIG_SND_SST_MFLD_PLATFORM=m
|
||||
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
|
||||
CONFIG_SND_SST_IPC=m
|
||||
CONFIG_SND_SST_IPC_PCI=m
|
||||
CONFIG_SND_SST_IPC_ACPI=m
|
||||
|
@ -6103,6 +6177,7 @@ CONFIG_SND_SOC_INTEL_HASWELL=m
|
|||
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
|
||||
|
@ -6151,6 +6226,8 @@ CONFIG_SND_SOC_DA7219=m
|
|||
CONFIG_SND_SOC_DMIC=m
|
||||
CONFIG_SND_SOC_HDMI_CODEC=m
|
||||
CONFIG_SND_SOC_ES8328=m
|
||||
CONFIG_SND_SOC_ES8328_I2C=m
|
||||
CONFIG_SND_SOC_ES8328_SPI=m
|
||||
CONFIG_SND_SOC_GTM601=m
|
||||
CONFIG_SND_SOC_HDAC_HDMI=m
|
||||
CONFIG_SND_SOC_INNO_RK3036=m
|
||||
|
@ -6180,7 +6257,8 @@ CONFIG_SND_SOC_RT5640=m
|
|||
CONFIG_SND_SOC_RT5645=m
|
||||
CONFIG_SND_SOC_RT5651=m
|
||||
CONFIG_SND_SOC_RT5670=m
|
||||
# CONFIG_SND_SOC_RT5677_SPI is not set
|
||||
CONFIG_SND_SOC_RT5677=m
|
||||
CONFIG_SND_SOC_RT5677_SPI=m
|
||||
CONFIG_SND_SOC_SGTL5000=m
|
||||
CONFIG_SND_SOC_SI476X=m
|
||||
CONFIG_SND_SOC_SIGMADSP=m
|
||||
|
@ -6227,11 +6305,14 @@ CONFIG_SND_SOC_WM8962=m
|
|||
CONFIG_SND_SOC_WM8974=m
|
||||
CONFIG_SND_SOC_WM8978=m
|
||||
CONFIG_SND_SOC_WM8985=m
|
||||
CONFIG_SND_SOC_NAU8540=m
|
||||
CONFIG_SND_SOC_NAU8810=m
|
||||
CONFIG_SND_SOC_NAU8825=m
|
||||
CONFIG_SND_SOC_TPA6130A2=m
|
||||
CONFIG_SND_SIMPLE_CARD_UTILS=m
|
||||
CONFIG_SND_SIMPLE_CARD=m
|
||||
CONFIG_SND_X86=y
|
||||
CONFIG_HDMI_LPE_AUDIO=m
|
||||
# CONFIG_SOUND_PRIME is not set
|
||||
CONFIG_AC97_BUS=m
|
||||
|
||||
|
@ -6492,6 +6573,7 @@ CONFIG_USB_CHIPIDEA=m
|
|||
CONFIG_USB_CHIPIDEA_PCI=m
|
||||
CONFIG_USB_CHIPIDEA_UDC=y
|
||||
CONFIG_USB_CHIPIDEA_HOST=y
|
||||
CONFIG_USB_CHIPIDEA_ULPI=y
|
||||
CONFIG_USB_ISP1760=m
|
||||
CONFIG_USB_ISP1760_HCD=y
|
||||
CONFIG_USB_ISP1761_UDC=y
|
||||
|
@ -6569,6 +6651,7 @@ CONFIG_USB_SERIAL_XSENS_MT=m
|
|||
CONFIG_USB_SERIAL_WISHBONE=m
|
||||
CONFIG_USB_SERIAL_SSU100=m
|
||||
CONFIG_USB_SERIAL_QT2=m
|
||||
CONFIG_USB_SERIAL_UPD78F0730=m
|
||||
CONFIG_USB_SERIAL_DEBUG=m
|
||||
|
||||
#
|
||||
|
@ -6596,6 +6679,7 @@ CONFIG_USB_EHSET_TEST_FIXTURE=m
|
|||
CONFIG_USB_ISIGHTFW=m
|
||||
CONFIG_USB_YUREX=m
|
||||
CONFIG_USB_EZUSB_FX2=m
|
||||
CONFIG_USB_HUB_USB251XB=m
|
||||
CONFIG_USB_HSIC_USB3503=m
|
||||
CONFIG_USB_HSIC_USB4604=m
|
||||
CONFIG_USB_LINK_LAYER_TEST=m
|
||||
|
@ -6770,6 +6854,7 @@ CONFIG_MEMSTICK_REALTEK_USB=m
|
|||
CONFIG_NEW_LEDS=y
|
||||
CONFIG_LEDS_CLASS=y
|
||||
CONFIG_LEDS_CLASS_FLASH=m
|
||||
# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
|
||||
|
||||
#
|
||||
# LED drivers
|
||||
|
@ -6871,6 +6956,7 @@ CONFIG_INFINIBAND_SRPT=m
|
|||
CONFIG_INFINIBAND_ISER=m
|
||||
CONFIG_INFINIBAND_ISERT=m
|
||||
CONFIG_RDMA_RXE=m
|
||||
CONFIG_INFINIBAND_BNXT_RE=m
|
||||
CONFIG_EDAC_ATOMIC_SCRUB=y
|
||||
CONFIG_EDAC_SUPPORT=y
|
||||
CONFIG_EDAC=y
|
||||
|
@ -7399,9 +7485,6 @@ CONFIG_STAGING_MEDIA=y
|
|||
CONFIG_I2C_BCM2048=m
|
||||
CONFIG_DVB_CXD2099=m
|
||||
CONFIG_LIRC_STAGING=y
|
||||
CONFIG_LIRC_BT829=m
|
||||
CONFIG_LIRC_IMON=m
|
||||
CONFIG_LIRC_PARALLEL=m
|
||||
CONFIG_LIRC_SASEM=m
|
||||
CONFIG_LIRC_SIR=m
|
||||
CONFIG_LIRC_ZILOG=m
|
||||
|
@ -7468,13 +7551,6 @@ CONFIG_AIM_V4L2=m
|
|||
CONFIG_HDM_DIM2=m
|
||||
CONFIG_HDM_I2C=m
|
||||
CONFIG_HDM_USB=m
|
||||
|
||||
#
|
||||
# Old ISDN4Linux (deprecated)
|
||||
#
|
||||
CONFIG_ISDN_DRV_ICN=m
|
||||
CONFIG_ISDN_DRV_PCBIT=m
|
||||
CONFIG_ISDN_DRV_ACT2000=m
|
||||
CONFIG_KS7010=m
|
||||
# CONFIG_GREYBUS is not set
|
||||
CONFIG_X86_PLATFORM_DEVICES=y
|
||||
|
@ -7529,7 +7605,6 @@ CONFIG_INTEL_HID_EVENT=m
|
|||
CONFIG_INTEL_VBTN=m
|
||||
CONFIG_INTEL_SCU_IPC=y
|
||||
CONFIG_INTEL_SCU_IPC_UTIL=m
|
||||
CONFIG_GPIO_INTEL_PMIC=y
|
||||
CONFIG_INTEL_MID_POWER_BUTTON=m
|
||||
CONFIG_INTEL_MFLD_THERMAL=m
|
||||
CONFIG_INTEL_IPS=m
|
||||
|
@ -7549,6 +7624,8 @@ CONFIG_SURFACE_PRO3_BUTTON=m
|
|||
CONFIG_SURFACE_3_BUTTON=m
|
||||
CONFIG_INTEL_PUNIT_IPC=m
|
||||
CONFIG_MLX_CPLD_PLATFORM=m
|
||||
# CONFIG_SILEAD_DMI is not set
|
||||
CONFIG_PMC_ATOM=y
|
||||
CONFIG_CHROME_PLATFORMS=y
|
||||
CONFIG_CHROMEOS_LAPTOP=m
|
||||
CONFIG_CHROMEOS_PSTORE=m
|
||||
|
@ -7574,13 +7651,6 @@ CONFIG_COMMON_CLK_PALMAS=m
|
|||
CONFIG_COMMON_CLK_PWM=m
|
||||
# CONFIG_COMMON_CLK_PXA is not set
|
||||
# CONFIG_COMMON_CLK_PIC32 is not set
|
||||
# CONFIG_COMMON_CLK_MT2701 is not set
|
||||
# CONFIG_COMMON_CLK_MT2701_MMSYS is not set
|
||||
# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set
|
||||
# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set
|
||||
# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
|
||||
# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
|
||||
# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
|
||||
|
||||
#
|
||||
# Hardware Spinlock drivers
|
||||
|
@ -7633,6 +7703,7 @@ CONFIG_REMOTEPROC=m
|
|||
#
|
||||
# CONFIG_SUNXI_SRAM is not set
|
||||
CONFIG_SOC_TI=y
|
||||
# CONFIG_SOC_ZTE is not set
|
||||
CONFIG_PM_DEVFREQ=y
|
||||
|
||||
#
|
||||
|
@ -7657,6 +7728,7 @@ CONFIG_EXTCON_ADC_JACK=m
|
|||
CONFIG_EXTCON_ARIZONA=m
|
||||
CONFIG_EXTCON_AXP288=m
|
||||
CONFIG_EXTCON_GPIO=m
|
||||
CONFIG_EXTCON_INTEL_INT3496=m
|
||||
CONFIG_EXTCON_MAX14577=m
|
||||
CONFIG_EXTCON_MAX3355=m
|
||||
CONFIG_EXTCON_MAX77693=m
|
||||
|
@ -7733,10 +7805,12 @@ CONFIG_AXP288_ADC=m
|
|||
CONFIG_CC10001_ADC=m
|
||||
CONFIG_DA9150_GPADC=m
|
||||
CONFIG_HI8435=m
|
||||
CONFIG_HX711=m
|
||||
CONFIG_INA2XX_ADC=m
|
||||
CONFIG_LP8788_ADC=m
|
||||
CONFIG_LTC2485=m
|
||||
CONFIG_MAX1027=m
|
||||
CONFIG_MAX11100=m
|
||||
CONFIG_MAX1363=m
|
||||
CONFIG_MCP320X=m
|
||||
CONFIG_MCP3422=m
|
||||
|
@ -7752,7 +7826,9 @@ CONFIG_TI_ADC12138=m
|
|||
CONFIG_TI_ADC128S052=m
|
||||
CONFIG_TI_ADC161S626=m
|
||||
CONFIG_TI_ADS1015=m
|
||||
CONFIG_TI_ADS7950=m
|
||||
CONFIG_TI_AM335X_ADC=m
|
||||
CONFIG_TI_TLC4541=m
|
||||
CONFIG_TWL4030_MADC=m
|
||||
CONFIG_TWL6030_GPADC=m
|
||||
CONFIG_VIPERBOARD_ADC=m
|
||||
|
@ -7852,6 +7928,8 @@ CONFIG_BMG160=m
|
|||
CONFIG_BMG160_I2C=m
|
||||
CONFIG_BMG160_SPI=m
|
||||
CONFIG_HID_SENSOR_GYRO_3D=m
|
||||
CONFIG_MPU3050=m
|
||||
CONFIG_MPU3050_I2C=m
|
||||
CONFIG_IIO_ST_GYRO_3AXIS=m
|
||||
CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
|
||||
CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
|
||||
|
@ -7893,6 +7971,9 @@ CONFIG_KMX61=m
|
|||
CONFIG_INV_MPU6050_IIO=m
|
||||
CONFIG_INV_MPU6050_I2C=m
|
||||
CONFIG_INV_MPU6050_SPI=m
|
||||
CONFIG_IIO_ST_LSM6DSX=m
|
||||
CONFIG_IIO_ST_LSM6DSX_I2C=m
|
||||
CONFIG_IIO_ST_LSM6DSX_SPI=m
|
||||
CONFIG_IIO_ADIS_LIB=m
|
||||
CONFIG_IIO_ADIS_LIB_BUFFER=y
|
||||
|
||||
|
@ -7969,6 +8050,7 @@ CONFIG_IIO_SYSFS_TRIGGER=m
|
|||
# Digital potentiometers
|
||||
#
|
||||
CONFIG_DS1803=m
|
||||
CONFIG_MAX5481=m
|
||||
CONFIG_MAX5487=m
|
||||
CONFIG_MCP4131=m
|
||||
CONFIG_MCP4531=m
|
||||
|
@ -7986,6 +8068,7 @@ CONFIG_ABP060MG=m
|
|||
CONFIG_BMP280=m
|
||||
CONFIG_BMP280_I2C=m
|
||||
CONFIG_BMP280_SPI=m
|
||||
CONFIG_IIO_CROS_EC_BARO=m
|
||||
CONFIG_HID_SENSOR_PRESS=m
|
||||
CONFIG_HP03=m
|
||||
CONFIG_MPL115=m
|
||||
|
@ -8011,10 +8094,11 @@ CONFIG_ZPA2326_SPI=m
|
|||
CONFIG_AS3935=m
|
||||
|
||||
#
|
||||
# Proximity sensors
|
||||
# Proximity and distance sensors
|
||||
#
|
||||
CONFIG_LIDAR_LITE_V2=m
|
||||
CONFIG_SX9500=m
|
||||
CONFIG_SRF08=m
|
||||
|
||||
#
|
||||
# Temperature sensors
|
||||
|
@ -8022,6 +8106,7 @@ CONFIG_SX9500=m
|
|||
CONFIG_MAXIM_THERMOCOUPLE=m
|
||||
CONFIG_MLX90614=m
|
||||
CONFIG_TMP006=m
|
||||
CONFIG_TMP007=m
|
||||
CONFIG_TSYS01=m
|
||||
CONFIG_TSYS02D=m
|
||||
CONFIG_NTB=m
|
||||
|
@ -8092,6 +8177,8 @@ CONFIG_PHY_SAMSUNG_USB2=m
|
|||
# CONFIG_PHY_EXYNOS4210_USB2 is not set
|
||||
# CONFIG_PHY_EXYNOS4X12_USB2 is not set
|
||||
# CONFIG_PHY_EXYNOS5250_USB2 is not set
|
||||
CONFIG_PHY_QCOM_USB_HS=m
|
||||
CONFIG_PHY_QCOM_USB_HSIC=m
|
||||
CONFIG_PHY_TUSB1210=m
|
||||
CONFIG_POWERCAP=y
|
||||
CONFIG_INTEL_RAPL=m
|
||||
|
@ -8137,10 +8224,14 @@ CONFIG_INTEL_TH_PTI=m
|
|||
#
|
||||
CONFIG_FPGA=m
|
||||
|
||||
#
|
||||
# FSI support
|
||||
#
|
||||
# CONFIG_FSI is not set
|
||||
|
||||
#
|
||||
# Firmware Drivers
|
||||
#
|
||||
# CONFIG_ARM_SCPI_PROTOCOL is not set
|
||||
CONFIG_EDD=y
|
||||
CONFIG_EDD_OFF=y
|
||||
CONFIG_FIRMWARE_MEMMAP=y
|
||||
|
@ -8554,6 +8645,7 @@ CONFIG_FRAME_POINTER=y
|
|||
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
|
||||
CONFIG_MAGIC_SYSRQ=y
|
||||
CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
|
||||
CONFIG_MAGIC_SYSRQ_SERIAL=y
|
||||
CONFIG_DEBUG_KERNEL=y
|
||||
|
||||
#
|
||||
|
@ -8563,6 +8655,7 @@ CONFIG_PAGE_EXTENSION=y
|
|||
# CONFIG_DEBUG_PAGEALLOC is not set
|
||||
# CONFIG_PAGE_POISONING is not set
|
||||
# CONFIG_DEBUG_PAGE_REF is not set
|
||||
# CONFIG_DEBUG_RODATA_TEST is not set
|
||||
# CONFIG_DEBUG_OBJECTS is not set
|
||||
# CONFIG_SLUB_DEBUG_ON is not set
|
||||
# CONFIG_SLUB_STATS is not set
|
||||
|
@ -8570,6 +8663,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
|
|||
# CONFIG_DEBUG_KMEMLEAK is not set
|
||||
# CONFIG_DEBUG_STACK_USAGE is not set
|
||||
# CONFIG_DEBUG_VM is not set
|
||||
CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
|
||||
# CONFIG_DEBUG_VIRTUAL is not set
|
||||
# CONFIG_DEBUG_MEMORY_INIT is not set
|
||||
CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
|
||||
|
@ -8602,7 +8696,6 @@ CONFIG_SCHED_INFO=y
|
|||
CONFIG_SCHEDSTATS=y
|
||||
CONFIG_SCHED_STACK_END_CHECK=y
|
||||
# CONFIG_DEBUG_TIMEKEEPING is not set
|
||||
CONFIG_TIMER_STATS=y
|
||||
|
||||
#
|
||||
# Lock Debugging (spinlocks, mutexes, etc...)
|
||||
|
@ -8617,6 +8710,7 @@ CONFIG_TIMER_STATS=y
|
|||
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
|
||||
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
|
||||
CONFIG_LOCK_TORTURE_TEST=m
|
||||
CONFIG_WW_MUTEX_SELFTEST=m
|
||||
CONFIG_STACKTRACE=y
|
||||
# CONFIG_DEBUG_KOBJECT is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
|
@ -8677,8 +8771,8 @@ CONFIG_BRANCH_PROFILE_NONE=y
|
|||
# CONFIG_PROFILE_ALL_BRANCHES is not set
|
||||
CONFIG_STACK_TRACER=y
|
||||
CONFIG_BLK_DEV_IO_TRACE=y
|
||||
CONFIG_KPROBE_EVENT=y
|
||||
CONFIG_UPROBE_EVENT=y
|
||||
CONFIG_KPROBE_EVENTS=y
|
||||
# CONFIG_UPROBE_EVENTS is not set
|
||||
CONFIG_BPF_EVENTS=y
|
||||
CONFIG_PROBE_EVENTS=y
|
||||
CONFIG_DYNAMIC_FTRACE=y
|
||||
|
@ -8700,6 +8794,7 @@ CONFIG_TRACING_EVENTS_GPIO=y
|
|||
#
|
||||
# CONFIG_LKDTM is not set
|
||||
# CONFIG_TEST_LIST_SORT is not set
|
||||
# CONFIG_TEST_SORT is not set
|
||||
# CONFIG_KPROBES_SANITY_TEST is not set
|
||||
# CONFIG_BACKTRACE_SELF_TEST is not set
|
||||
CONFIG_RBTREE_TEST=m
|
||||
|
@ -8715,6 +8810,7 @@ CONFIG_TEST_BITMAP=m
|
|||
CONFIG_TEST_UUID=m
|
||||
# CONFIG_TEST_RHASHTABLE is not set
|
||||
CONFIG_TEST_HASH=m
|
||||
CONFIG_TEST_PARMAN=m
|
||||
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
|
||||
# CONFIG_DMA_API_DEBUG is not set
|
||||
CONFIG_TEST_LKM=m
|
||||
|
@ -8748,10 +8844,7 @@ CONFIG_EARLY_PRINTK_EFI=y
|
|||
# CONFIG_X86_PTDUMP_CORE is not set
|
||||
# CONFIG_X86_PTDUMP is not set
|
||||
# CONFIG_EFI_PGT_DUMP is not set
|
||||
# CONFIG_DEBUG_RODATA_TEST is not set
|
||||
# CONFIG_DEBUG_WX is not set
|
||||
CONFIG_DEBUG_SET_MODULE_RONX=y
|
||||
# CONFIG_DEBUG_NX_TEST is not set
|
||||
CONFIG_DOUBLEFAULT=y
|
||||
# CONFIG_DEBUG_TLBFLUSH is not set
|
||||
# CONFIG_IOMMU_STRESS is not set
|
||||
|
@ -8795,6 +8888,7 @@ CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
|
|||
CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
|
||||
# CONFIG_STATIC_USERMODEHELPER is not set
|
||||
CONFIG_SECURITY_SELINUX=y
|
||||
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
||||
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
|
||||
|
@ -8816,6 +8910,7 @@ CONFIG_SECURITY_APPARMOR=y
|
|||
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
|
||||
CONFIG_SECURITY_APPARMOR_HASH=y
|
||||
CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
|
||||
# CONFIG_SECURITY_APPARMOR_DEBUG is not set
|
||||
# CONFIG_SECURITY_LOADPIN is not set
|
||||
CONFIG_SECURITY_YAMA=y
|
||||
CONFIG_INTEGRITY=y
|
||||
|
@ -8897,6 +8992,7 @@ CONFIG_CRYPTO_TEST=m
|
|||
CONFIG_CRYPTO_ABLK_HELPER=m
|
||||
CONFIG_CRYPTO_SIMD=m
|
||||
CONFIG_CRYPTO_GLUE_HELPER_X86=m
|
||||
CONFIG_CRYPTO_ENGINE=m
|
||||
|
||||
#
|
||||
# Authenticated Encryption with Associated Data
|
||||
|
@ -8955,6 +9051,7 @@ CONFIG_CRYPTO_WP512=m
|
|||
# Ciphers
|
||||
#
|
||||
CONFIG_CRYPTO_AES=y
|
||||
CONFIG_CRYPTO_AES_TI=m
|
||||
CONFIG_CRYPTO_AES_586=m
|
||||
CONFIG_CRYPTO_AES_NI_INTEL=m
|
||||
CONFIG_CRYPTO_ANUBIS=m
|
||||
|
@ -9133,6 +9230,8 @@ CONFIG_ASSOCIATIVE_ARRAY=y
|
|||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT_MAP=y
|
||||
CONFIG_HAS_DMA=y
|
||||
# CONFIG_DMA_NOOP_OPS is not set
|
||||
CONFIG_DMA_VIRT_OPS=y
|
||||
CONFIG_CHECK_SIGNATURE=y
|
||||
CONFIG_CPU_RMAP=y
|
||||
CONFIG_DQL=y
|
||||
|
@ -9157,3 +9256,4 @@ CONFIG_SG_POOL=y
|
|||
CONFIG_ARCH_HAS_SG_CHAIN=y
|
||||
CONFIG_ARCH_HAS_MMIO_FLUSH=y
|
||||
CONFIG_SBITMAP=y
|
||||
CONFIG_PARMAN=m
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.10.0-gnu Kernel Configuration
|
||||
# Linux/x86 4.11.0-gnu Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
|
@ -41,7 +41,6 @@ CONFIG_HAVE_INTEL_TXT=y
|
|||
CONFIG_X86_64_SMP=y
|
||||
CONFIG_ARCH_SUPPORTS_UPROBES=y
|
||||
CONFIG_FIX_EARLYCON_MEM=y
|
||||
CONFIG_DEBUG_RODATA=y
|
||||
CONFIG_PGTABLE_LEVELS=4
|
||||
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
|
||||
CONFIG_IRQ_WORK=y
|
||||
|
@ -139,12 +138,11 @@ CONFIG_SRCU=y
|
|||
# CONFIG_TASKS_RCU is not set
|
||||
CONFIG_RCU_STALL_COMMON=y
|
||||
# CONFIG_TREE_RCU_TRACE is not set
|
||||
# CONFIG_RCU_EXPEDITE_BOOT is not set
|
||||
CONFIG_BUILD_BIN2C=y
|
||||
# CONFIG_IKCONFIG is not set
|
||||
CONFIG_LOG_BUF_SHIFT=18
|
||||
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
|
||||
CONFIG_NMI_LOG_BUF_SHIFT=13
|
||||
CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
|
||||
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
|
||||
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
|
||||
CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
|
||||
|
@ -164,6 +162,7 @@ CONFIG_FAIR_GROUP_SCHED=y
|
|||
CONFIG_CFS_BANDWIDTH=y
|
||||
# CONFIG_RT_GROUP_SCHED is not set
|
||||
CONFIG_CGROUP_PIDS=y
|
||||
# CONFIG_CGROUP_RDMA is not set
|
||||
CONFIG_CGROUP_FREEZER=y
|
||||
CONFIG_CGROUP_HUGETLB=y
|
||||
CONFIG_CPUSETS=y
|
||||
|
@ -232,6 +231,7 @@ CONFIG_PCI_QUIRKS=y
|
|||
CONFIG_MEMBARRIER=y
|
||||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_HAVE_PERF_EVENTS=y
|
||||
# CONFIG_PC104 is not set
|
||||
|
||||
#
|
||||
# Kernel Performance Events And Counters
|
||||
|
@ -240,6 +240,7 @@ CONFIG_PERF_EVENTS=y
|
|||
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
|
||||
CONFIG_VM_EVENT_COUNTERS=y
|
||||
CONFIG_SLUB_DEBUG=y
|
||||
# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
|
||||
# CONFIG_COMPAT_BRK is not set
|
||||
# CONFIG_SLAB is not set
|
||||
CONFIG_SLUB=y
|
||||
|
@ -259,7 +260,7 @@ CONFIG_JUMP_LABEL=y
|
|||
# CONFIG_STATIC_KEYS_SELFTEST is not set
|
||||
CONFIG_OPTPROBES=y
|
||||
CONFIG_KPROBES_ON_FTRACE=y
|
||||
CONFIG_UPROBES=y
|
||||
# CONFIG_UPROBES is not set
|
||||
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
|
||||
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
|
||||
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
|
||||
|
@ -274,6 +275,7 @@ CONFIG_HAVE_NMI=y
|
|||
CONFIG_HAVE_ARCH_TRACEHOOK=y
|
||||
CONFIG_HAVE_DMA_CONTIGUOUS=y
|
||||
CONFIG_GENERIC_SMP_IDLE_THREAD=y
|
||||
CONFIG_ARCH_HAS_SET_MEMORY=y
|
||||
CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
|
||||
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
|
||||
CONFIG_HAVE_CLK=y
|
||||
|
@ -297,6 +299,7 @@ CONFIG_HAVE_GCC_PLUGINS=y
|
|||
CONFIG_GCC_PLUGINS=y
|
||||
# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
|
||||
# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
|
||||
# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
|
||||
CONFIG_HAVE_CC_STACKPROTECTOR=y
|
||||
CONFIG_CC_STACKPROTECTOR=y
|
||||
# CONFIG_CC_STACKPROTECTOR_NONE is not set
|
||||
|
@ -307,6 +310,7 @@ CONFIG_HAVE_CONTEXT_TRACKING=y
|
|||
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
|
||||
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
|
||||
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
|
||||
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
|
||||
CONFIG_HAVE_ARCH_HUGE_VMAP=y
|
||||
CONFIG_HAVE_ARCH_SOFT_DIRTY=y
|
||||
CONFIG_MODULES_USE_ELF_RELA=y
|
||||
|
@ -326,6 +330,12 @@ CONFIG_COMPAT_OLD_SIGACTION=y
|
|||
# CONFIG_CPU_NO_EFFICIENT_FFS is not set
|
||||
CONFIG_HAVE_ARCH_VMAP_STACK=y
|
||||
CONFIG_VMAP_STACK=y
|
||||
# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
|
||||
# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
|
||||
CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
|
||||
CONFIG_STRICT_KERNEL_RWX=y
|
||||
CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
|
||||
CONFIG_STRICT_MODULE_RWX=y
|
||||
|
||||
#
|
||||
# GCOV-based kernel profiling
|
||||
|
@ -346,6 +356,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
|
|||
# CONFIG_MODULE_COMPRESS is not set
|
||||
CONFIG_MODULES_TREE_LOOKUP=y
|
||||
CONFIG_BLOCK=y
|
||||
CONFIG_BLK_SCSI_REQUEST=y
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
CONFIG_BLK_DEV_BSGLIB=y
|
||||
CONFIG_BLK_DEV_INTEGRITY=y
|
||||
|
@ -355,6 +366,8 @@ CONFIG_BLK_CMDLINE_PARSER=y
|
|||
CONFIG_BLK_WBT=y
|
||||
# CONFIG_BLK_WBT_SQ is not set
|
||||
CONFIG_BLK_WBT_MQ=y
|
||||
CONFIG_BLK_DEBUG_FS=y
|
||||
# CONFIG_BLK_SED_OPAL is not set
|
||||
|
||||
#
|
||||
# Partition Types
|
||||
|
@ -382,6 +395,7 @@ CONFIG_SYSV68_PARTITION=y
|
|||
CONFIG_CMDLINE_PARTITION=y
|
||||
CONFIG_BLOCK_COMPAT=y
|
||||
CONFIG_BLK_MQ_PCI=y
|
||||
CONFIG_BLK_MQ_VIRTIO=y
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
|
@ -394,6 +408,7 @@ CONFIG_DEFAULT_DEADLINE=y
|
|||
# CONFIG_DEFAULT_CFQ is not set
|
||||
# CONFIG_DEFAULT_NOOP is not set
|
||||
CONFIG_DEFAULT_IOSCHED="deadline"
|
||||
CONFIG_MQ_IOSCHED_DEADLINE=m
|
||||
CONFIG_PREEMPT_NOTIFIERS=y
|
||||
CONFIG_PADATA=y
|
||||
CONFIG_ASN1=y
|
||||
|
@ -729,7 +744,6 @@ CONFIG_CPU_FREQ=y
|
|||
CONFIG_CPU_FREQ_GOV_ATTR_SET=y
|
||||
CONFIG_CPU_FREQ_GOV_COMMON=y
|
||||
CONFIG_CPU_FREQ_STAT=y
|
||||
CONFIG_CPU_FREQ_STAT_DETAILS=y
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
|
||||
|
@ -787,6 +801,7 @@ CONFIG_PCIEASPM=y
|
|||
CONFIG_PCIEASPM_DEBUG=y
|
||||
CONFIG_PCIEASPM_DEFAULT=y
|
||||
# CONFIG_PCIEASPM_POWERSAVE is not set
|
||||
# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
|
||||
# CONFIG_PCIEASPM_PERFORMANCE is not set
|
||||
CONFIG_PCIE_PME=y
|
||||
CONFIG_PCIE_DPC=y
|
||||
|
@ -814,9 +829,13 @@ CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
|
|||
CONFIG_HOTPLUG_PCI_SHPC=m
|
||||
|
||||
#
|
||||
# PCI host controller drivers
|
||||
# DesignWare PCI Core Support
|
||||
#
|
||||
# CONFIG_PCIE_DW_PLAT is not set
|
||||
|
||||
#
|
||||
# PCI host controller drivers
|
||||
#
|
||||
# CONFIG_VMD is not set
|
||||
# CONFIG_ISA_BUS is not set
|
||||
CONFIG_ISA_DMA_API=y
|
||||
|
@ -878,7 +897,6 @@ CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
|
|||
CONFIG_SYSVIPC_COMPAT=y
|
||||
CONFIG_KEYS_COMPAT=y
|
||||
CONFIG_X86_DEV_DMA_OPS=y
|
||||
CONFIG_PMC_ATOM=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_COMPAT_NETLINK_MESSAGES=y
|
||||
CONFIG_NET_INGRESS=y
|
||||
|
@ -892,6 +910,7 @@ CONFIG_PACKET_DIAG=m
|
|||
CONFIG_UNIX=y
|
||||
CONFIG_UNIX_DIAG=m
|
||||
CONFIG_XFRM=y
|
||||
CONFIG_XFRM_OFFLOAD=y
|
||||
CONFIG_XFRM_ALGO=m
|
||||
CONFIG_XFRM_USER=m
|
||||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
|
@ -900,6 +919,7 @@ CONFIG_XFRM_STATISTICS=y
|
|||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=m
|
||||
# CONFIG_NET_KEY_MIGRATE is not set
|
||||
# CONFIG_SMC is not set
|
||||
CONFIG_INET=y
|
||||
CONFIG_IP_MULTICAST=y
|
||||
CONFIG_IP_ADVANCED_ROUTER=y
|
||||
|
@ -928,6 +948,7 @@ CONFIG_NET_FOU=m
|
|||
CONFIG_NET_FOU_IP_TUNNELS=y
|
||||
CONFIG_INET_AH=m
|
||||
CONFIG_INET_ESP=m
|
||||
CONFIG_INET_ESP_OFFLOAD=m
|
||||
CONFIG_INET_IPCOMP=m
|
||||
CONFIG_INET_XFRM_TUNNEL=m
|
||||
CONFIG_INET_TUNNEL=m
|
||||
|
@ -966,6 +987,7 @@ CONFIG_IPV6_ROUTE_INFO=y
|
|||
# CONFIG_IPV6_OPTIMISTIC_DAD is not set
|
||||
CONFIG_INET6_AH=m
|
||||
CONFIG_INET6_ESP=m
|
||||
CONFIG_INET6_ESP_OFFLOAD=m
|
||||
CONFIG_INET6_IPCOMP=m
|
||||
CONFIG_IPV6_MIP6=m
|
||||
CONFIG_IPV6_ILA=m
|
||||
|
@ -1059,6 +1081,7 @@ CONFIG_NFT_NUMGEN=m
|
|||
CONFIG_NFT_CT=m
|
||||
CONFIG_NFT_SET_RBTREE=m
|
||||
CONFIG_NFT_SET_HASH=m
|
||||
CONFIG_NFT_SET_BITMAP=m
|
||||
CONFIG_NFT_COUNTER=m
|
||||
CONFIG_NFT_LOG=m
|
||||
CONFIG_NFT_LIMIT=m
|
||||
|
@ -1391,6 +1414,12 @@ CONFIG_BRIDGE=m
|
|||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
CONFIG_BRIDGE_VLAN_FILTERING=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
CONFIG_NET_DSA=m
|
||||
CONFIG_NET_DSA_TAG_BRCM=y
|
||||
CONFIG_NET_DSA_TAG_DSA=y
|
||||
CONFIG_NET_DSA_TAG_EDSA=y
|
||||
CONFIG_NET_DSA_TAG_TRAILER=y
|
||||
CONFIG_NET_DSA_TAG_QCA=y
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VLAN_8021Q_GVRP=y
|
||||
CONFIG_VLAN_8021Q_MVRP=y
|
||||
|
@ -1491,6 +1520,7 @@ CONFIG_NET_ACT_POLICE=m
|
|||
CONFIG_NET_ACT_GACT=m
|
||||
CONFIG_GACT_PROB=y
|
||||
CONFIG_NET_ACT_MIRRED=m
|
||||
CONFIG_NET_ACT_SAMPLE=m
|
||||
CONFIG_NET_ACT_IPT=m
|
||||
CONFIG_NET_ACT_NAT=m
|
||||
CONFIG_NET_ACT_PEDIT=m
|
||||
|
@ -1532,7 +1562,7 @@ CONFIG_NET_MPLS_GSO=m
|
|||
CONFIG_MPLS_ROUTING=m
|
||||
CONFIG_MPLS_IPTUNNEL=m
|
||||
CONFIG_HSR=m
|
||||
# CONFIG_NET_SWITCHDEV is not set
|
||||
CONFIG_NET_SWITCHDEV=y
|
||||
CONFIG_NET_L3_MASTER_DEV=y
|
||||
CONFIG_NET_NCSI=y
|
||||
CONFIG_RPS=y
|
||||
|
@ -1774,7 +1804,6 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
|
|||
CONFIG_RFKILL=y
|
||||
CONFIG_RFKILL_LEDS=y
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL_REGULATOR=m
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_NET_9P=m
|
||||
CONFIG_NET_9P_VIRTIO=m
|
||||
|
@ -1829,9 +1858,12 @@ CONFIG_NFC_NXP_NCI_I2C=m
|
|||
CONFIG_NFC_S3FWRN5=m
|
||||
CONFIG_NFC_S3FWRN5_I2C=m
|
||||
CONFIG_NFC_ST95HF=m
|
||||
CONFIG_PSAMPLE=m
|
||||
CONFIG_NET_IFE=m
|
||||
CONFIG_LWTUNNEL=y
|
||||
CONFIG_LWTUNNEL_BPF=y
|
||||
CONFIG_DST_CACHE=y
|
||||
CONFIG_GRO_CELLS=y
|
||||
CONFIG_NET_DEVLINK=m
|
||||
CONFIG_MAY_USE_DEVLINK=m
|
||||
CONFIG_HAVE_EBPF_JIT=y
|
||||
|
@ -1997,7 +2029,6 @@ CONFIG_MTD_NAND_DOCG4=m
|
|||
CONFIG_MTD_NAND_CAFE=m
|
||||
CONFIG_MTD_NAND_NANDSIM=m
|
||||
CONFIG_MTD_NAND_PLATFORM=m
|
||||
CONFIG_MTD_NAND_OXNAS=m
|
||||
CONFIG_MTD_NAND_HISI504=m
|
||||
CONFIG_MTD_NAND_MTK=m
|
||||
CONFIG_MTD_ONENAND=m
|
||||
|
@ -2014,6 +2045,8 @@ CONFIG_MTD_QINFO_PROBE=m
|
|||
CONFIG_MTD_SPI_NOR=m
|
||||
CONFIG_MTD_MT81xx_NOR=m
|
||||
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
|
||||
CONFIG_SPI_INTEL_SPI=m
|
||||
CONFIG_SPI_INTEL_SPI_PLATFORM=m
|
||||
CONFIG_MTD_UBI=m
|
||||
CONFIG_MTD_UBI_WL_THRESHOLD=4096
|
||||
CONFIG_MTD_UBI_BEB_LIMIT=20
|
||||
|
@ -2098,6 +2131,7 @@ CONFIG_ATA_OVER_ETH=m
|
|||
CONFIG_XEN_BLKDEV_FRONTEND=y
|
||||
CONFIG_XEN_BLKDEV_BACKEND=m
|
||||
CONFIG_VIRTIO_BLK=y
|
||||
# CONFIG_VIRTIO_BLK_SCSI is not set
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
CONFIG_BLK_DEV_RSXX=m
|
||||
|
@ -2158,6 +2192,7 @@ CONFIG_EEPROM_LEGACY=m
|
|||
CONFIG_EEPROM_MAX6875=m
|
||||
CONFIG_EEPROM_93CX6=m
|
||||
CONFIG_EEPROM_93XX46=m
|
||||
CONFIG_EEPROM_IDT_89HPESX=m
|
||||
CONFIG_CB710_CORE=m
|
||||
# CONFIG_CB710_DEBUG is not set
|
||||
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
|
||||
|
@ -2355,6 +2390,7 @@ CONFIG_TCM_QLA2XXX=m
|
|||
# CONFIG_TCM_QLA2XXX_DEBUG is not set
|
||||
CONFIG_SCSI_QLA_ISCSI=m
|
||||
CONFIG_QEDI=m
|
||||
CONFIG_QEDF=m
|
||||
CONFIG_SCSI_LPFC=m
|
||||
# CONFIG_SCSI_LPFC_DEBUG_FS is not set
|
||||
CONFIG_SCSI_DC395x=m
|
||||
|
@ -2566,6 +2602,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m
|
|||
CONFIG_MACVLAN=m
|
||||
CONFIG_MACVTAP=m
|
||||
CONFIG_IPVLAN=m
|
||||
CONFIG_IPVTAP=m
|
||||
CONFIG_VXLAN=m
|
||||
CONFIG_GENEVE=m
|
||||
CONFIG_GTP=m
|
||||
|
@ -2579,6 +2616,7 @@ CONFIG_RIONET=m
|
|||
CONFIG_RIONET_TX_SIZE=128
|
||||
CONFIG_RIONET_RX_SIZE=128
|
||||
CONFIG_TUN=y
|
||||
CONFIG_TAP=m
|
||||
# CONFIG_TUN_VNET_CROSS_LE is not set
|
||||
CONFIG_VETH=m
|
||||
CONFIG_VIRTIO_NET=y
|
||||
|
@ -2639,6 +2677,16 @@ CONFIG_CAIF_VIRTIO=m
|
|||
#
|
||||
# Distributed Switch Architecture drivers
|
||||
#
|
||||
CONFIG_NET_DSA_MV88E6060=m
|
||||
CONFIG_NET_DSA_BCM_SF2=m
|
||||
CONFIG_B53=m
|
||||
CONFIG_B53_SPI_DRIVER=m
|
||||
CONFIG_B53_MDIO_DRIVER=m
|
||||
CONFIG_B53_MMAP_DRIVER=m
|
||||
CONFIG_B53_SRAB_DRIVER=m
|
||||
CONFIG_NET_DSA_MV88E6XXX=m
|
||||
CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
|
||||
CONFIG_NET_DSA_QCA8K=m
|
||||
CONFIG_ETHERNET=y
|
||||
CONFIG_MDIO=m
|
||||
CONFIG_NET_VENDOR_3COM=y
|
||||
|
@ -2665,6 +2713,8 @@ CONFIG_PCMCIA_NMCLAN=m
|
|||
CONFIG_AMD_XGBE=m
|
||||
# CONFIG_AMD_XGBE_DCB is not set
|
||||
CONFIG_AMD_XGBE_HAVE_ECC=y
|
||||
CONFIG_NET_VENDOR_AQUANTIA=y
|
||||
CONFIG_AQTION=m
|
||||
CONFIG_NET_VENDOR_ARC=y
|
||||
CONFIG_NET_VENDOR_ATHEROS=y
|
||||
CONFIG_ATL2=m
|
||||
|
@ -2784,6 +2834,10 @@ CONFIG_MLXSW_CORE_HWMON=y
|
|||
CONFIG_MLXSW_CORE_THERMAL=y
|
||||
CONFIG_MLXSW_PCI=m
|
||||
CONFIG_MLXSW_I2C=m
|
||||
CONFIG_MLXSW_SWITCHIB=m
|
||||
CONFIG_MLXSW_SWITCHX2=m
|
||||
CONFIG_MLXSW_SPECTRUM=m
|
||||
CONFIG_MLXSW_SPECTRUM_DCB=y
|
||||
CONFIG_MLXSW_MINIMAL=m
|
||||
CONFIG_NET_VENDOR_MICREL=y
|
||||
CONFIG_KS8842=m
|
||||
|
@ -2802,8 +2856,8 @@ CONFIG_NET_VENDOR_NATSEMI=y
|
|||
CONFIG_NATSEMI=m
|
||||
CONFIG_NS83820=m
|
||||
CONFIG_NET_VENDOR_NETRONOME=y
|
||||
CONFIG_NFP_NETVF=m
|
||||
# CONFIG_NFP_NET_DEBUG is not set
|
||||
CONFIG_NFP=m
|
||||
# CONFIG_NFP_DEBUG is not set
|
||||
CONFIG_NET_VENDOR_8390=y
|
||||
CONFIG_PCMCIA_AXNET=m
|
||||
CONFIG_NE2K_PCI=m
|
||||
|
@ -2829,6 +2883,7 @@ CONFIG_QED_SRIOV=y
|
|||
CONFIG_QEDE=m
|
||||
CONFIG_QED_RDMA=y
|
||||
CONFIG_QED_ISCSI=y
|
||||
CONFIG_QED_FCOE=y
|
||||
CONFIG_NET_VENDOR_QUALCOMM=y
|
||||
CONFIG_QCOM_EMAC=m
|
||||
CONFIG_NET_VENDOR_REALTEK=y
|
||||
|
@ -2844,6 +2899,7 @@ CONFIG_NET_VENDOR_RENESAS=y
|
|||
CONFIG_NET_VENDOR_RDC=y
|
||||
CONFIG_R6040=m
|
||||
CONFIG_NET_VENDOR_ROCKER=y
|
||||
CONFIG_ROCKER=m
|
||||
CONFIG_NET_VENDOR_SAMSUNG=y
|
||||
CONFIG_SXGBE_ETH=m
|
||||
CONFIG_NET_VENDOR_SEEQ=y
|
||||
|
@ -2876,7 +2932,6 @@ CONFIG_HAPPYMEAL=m
|
|||
CONFIG_SUNGEM=m
|
||||
CONFIG_CASSINI=m
|
||||
CONFIG_NIU=m
|
||||
CONFIG_NET_VENDOR_SYNOPSYS=y
|
||||
CONFIG_NET_VENDOR_TEHUTI=y
|
||||
CONFIG_TEHUTI=m
|
||||
CONFIG_NET_VENDOR_TI=y
|
||||
|
@ -3022,6 +3077,7 @@ CONFIG_ATH5K=m
|
|||
CONFIG_ATH5K_PCI=y
|
||||
CONFIG_ATH9K_HW=m
|
||||
CONFIG_ATH9K_COMMON=m
|
||||
CONFIG_ATH9K_COMMON_DEBUG=y
|
||||
CONFIG_ATH9K_BTCOEX_SUPPORT=y
|
||||
CONFIG_ATH9K=m
|
||||
CONFIG_ATH9K_PCI=y
|
||||
|
@ -3431,7 +3487,6 @@ CONFIG_MISDN_ISAR=m
|
|||
CONFIG_ISDN_HDLC=m
|
||||
CONFIG_NVM=y
|
||||
# CONFIG_NVM_DEBUG is not set
|
||||
CONFIG_NVM_GENNVM=m
|
||||
CONFIG_NVM_RRPC=m
|
||||
|
||||
#
|
||||
|
@ -3482,6 +3537,7 @@ CONFIG_KEYBOARD_OPENCORES=m
|
|||
CONFIG_KEYBOARD_SAMSUNG=m
|
||||
CONFIG_KEYBOARD_STOWAWAY=m
|
||||
CONFIG_KEYBOARD_SUNKBD=m
|
||||
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
|
||||
CONFIG_KEYBOARD_TWL4030=m
|
||||
CONFIG_KEYBOARD_XTKBD=m
|
||||
CONFIG_KEYBOARD_CROS_EC=m
|
||||
|
@ -3638,6 +3694,7 @@ CONFIG_TOUCHSCREEN_SUR40=m
|
|||
CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
|
||||
CONFIG_TOUCHSCREEN_SX8654=m
|
||||
CONFIG_TOUCHSCREEN_TPS6507X=m
|
||||
CONFIG_TOUCHSCREEN_ZET6223=m
|
||||
CONFIG_TOUCHSCREEN_ZFORCE=m
|
||||
CONFIG_TOUCHSCREEN_ROHM_BU21023=m
|
||||
CONFIG_INPUT_MISC=y
|
||||
|
@ -3655,7 +3712,6 @@ CONFIG_INPUT_MAX8925_ONKEY=m
|
|||
CONFIG_INPUT_MAX8997_HAPTIC=m
|
||||
CONFIG_INPUT_MC13783_PWRBUTTON=m
|
||||
CONFIG_INPUT_MMA8450=m
|
||||
CONFIG_INPUT_MPU3050=m
|
||||
CONFIG_INPUT_APANEL=m
|
||||
CONFIG_INPUT_GP2A=m
|
||||
CONFIG_INPUT_GPIO_BEEPER=m
|
||||
|
@ -3703,7 +3759,8 @@ CONFIG_RMI4_CORE=m
|
|||
CONFIG_RMI4_I2C=m
|
||||
CONFIG_RMI4_SPI=m
|
||||
CONFIG_RMI4_SMB=m
|
||||
# CONFIG_RMI4_F03 is not set
|
||||
CONFIG_RMI4_F03=y
|
||||
CONFIG_RMI4_F03_SERIO=m
|
||||
CONFIG_RMI4_2D_SENSOR=y
|
||||
CONFIG_RMI4_F11=y
|
||||
CONFIG_RMI4_F12=y
|
||||
|
@ -3777,6 +3834,7 @@ CONFIG_SERIAL_8250_PNP=y
|
|||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_SERIAL_8250_DMA=y
|
||||
CONFIG_SERIAL_8250_PCI=y
|
||||
CONFIG_SERIAL_8250_EXAR=m
|
||||
CONFIG_SERIAL_8250_CS=m
|
||||
CONFIG_SERIAL_8250_NR_UARTS=48
|
||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=32
|
||||
|
@ -3820,6 +3878,8 @@ CONFIG_SERIAL_RP2=m
|
|||
CONFIG_SERIAL_RP2_NR_UARTS=32
|
||||
CONFIG_SERIAL_FSL_LPUART=m
|
||||
CONFIG_SERIAL_MEN_Z135=m
|
||||
CONFIG_SERIAL_DEV_BUS=y
|
||||
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
|
||||
CONFIG_TTY_PRINTK=y
|
||||
CONFIG_PRINTER=m
|
||||
# CONFIG_LP_CONSOLE is not set
|
||||
|
@ -4050,6 +4110,7 @@ CONFIG_PTP_1588_CLOCK=m
|
|||
#
|
||||
# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
|
||||
#
|
||||
CONFIG_PTP_1588_CLOCK_KVM=m
|
||||
CONFIG_PINCTRL=y
|
||||
|
||||
#
|
||||
|
@ -4065,6 +4126,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
|
|||
CONFIG_PINCTRL_CHERRYVIEW=m
|
||||
CONFIG_PINCTRL_INTEL=m
|
||||
CONFIG_PINCTRL_BROXTON=m
|
||||
CONFIG_PINCTRL_GEMINILAKE=m
|
||||
CONFIG_PINCTRL_SUNRISEPOINT=m
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_GPIO_ACPI=y
|
||||
|
@ -4080,6 +4142,7 @@ CONFIG_GPIO_MAX730X=m
|
|||
CONFIG_GPIO_AMDPT=m
|
||||
CONFIG_GPIO_AXP209=m
|
||||
CONFIG_GPIO_DWAPB=m
|
||||
CONFIG_GPIO_EXAR=m
|
||||
CONFIG_GPIO_GENERIC_PLATFORM=m
|
||||
CONFIG_GPIO_ICH=m
|
||||
CONFIG_GPIO_LYNXPOINT=y
|
||||
|
@ -4139,6 +4202,7 @@ CONFIG_GPIO_WM8994=m
|
|||
#
|
||||
CONFIG_GPIO_AMD8111=m
|
||||
CONFIG_GPIO_ML_IOH=m
|
||||
CONFIG_GPIO_PCI_IDIO_16=m
|
||||
CONFIG_GPIO_RDC321X=m
|
||||
|
||||
#
|
||||
|
@ -4173,6 +4237,7 @@ CONFIG_W1_MASTER_GPIO=m
|
|||
#
|
||||
CONFIG_W1_SLAVE_THERM=m
|
||||
CONFIG_W1_SLAVE_SMEM=m
|
||||
CONFIG_W1_SLAVE_DS2405=m
|
||||
CONFIG_W1_SLAVE_DS2408=m
|
||||
CONFIG_W1_SLAVE_DS2408_READBACK=y
|
||||
CONFIG_W1_SLAVE_DS2413=m
|
||||
|
@ -4204,6 +4269,7 @@ CONFIG_BATTERY_DS2780=m
|
|||
CONFIG_BATTERY_DS2781=m
|
||||
CONFIG_BATTERY_DS2782=m
|
||||
CONFIG_BATTERY_SBS=m
|
||||
CONFIG_CHARGER_SBS=m
|
||||
CONFIG_BATTERY_BQ27XXX=m
|
||||
CONFIG_BATTERY_BQ27XXX_I2C=m
|
||||
CONFIG_BATTERY_DA9030=m
|
||||
|
@ -4377,6 +4443,7 @@ CONFIG_SENSORS_SMSC47B397=m
|
|||
CONFIG_SENSORS_SCH56XX_COMMON=m
|
||||
CONFIG_SENSORS_SCH5627=m
|
||||
CONFIG_SENSORS_SCH5636=m
|
||||
CONFIG_SENSORS_STTS751=m
|
||||
CONFIG_SENSORS_SMM665=m
|
||||
CONFIG_SENSORS_ADC128D818=m
|
||||
CONFIG_SENSORS_ADS1015=m
|
||||
|
@ -4503,6 +4570,7 @@ CONFIG_MACHZ_WDT=m
|
|||
CONFIG_SBC_EPX_C3_WATCHDOG=m
|
||||
CONFIG_INTEL_MEI_WDT=m
|
||||
CONFIG_NI903X_WDT=m
|
||||
CONFIG_NIC7018_WDT=m
|
||||
CONFIG_MEN_A21_WDT=m
|
||||
CONFIG_XEN_WDT=m
|
||||
|
||||
|
@ -4819,6 +4887,7 @@ CONFIG_IR_ITE_CIR=m
|
|||
CONFIG_IR_FINTEK=m
|
||||
CONFIG_IR_NUVOTON=m
|
||||
CONFIG_IR_REDRAT3=m
|
||||
CONFIG_IR_SPI=m
|
||||
CONFIG_IR_STREAMZAP=m
|
||||
CONFIG_IR_WINBOND_CIR=m
|
||||
CONFIG_IR_IGORPLUGUSB=m
|
||||
|
@ -4904,7 +4973,6 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
|
|||
CONFIG_VIDEO_HDPVR=m
|
||||
CONFIG_VIDEO_USBVISION=m
|
||||
CONFIG_VIDEO_STK1160_COMMON=m
|
||||
CONFIG_VIDEO_STK1160_AC97=y
|
||||
CONFIG_VIDEO_STK1160=m
|
||||
CONFIG_VIDEO_GO7007=m
|
||||
CONFIG_VIDEO_GO7007_USB=m
|
||||
|
@ -4969,6 +5037,7 @@ CONFIG_DVB_USB_LME2510=m
|
|||
CONFIG_DVB_USB_MXL111SF=m
|
||||
CONFIG_DVB_USB_RTL28XXU=m
|
||||
CONFIG_DVB_USB_DVBSKY=m
|
||||
CONFIG_DVB_USB_ZD1301=m
|
||||
CONFIG_DVB_TTUSB_BUDGET=m
|
||||
CONFIG_DVB_TTUSB_DEC=m
|
||||
CONFIG_SMS_USB_DRV=m
|
||||
|
@ -5019,6 +5088,7 @@ CONFIG_VIDEO_ZORAN_AVS6EYES=m
|
|||
# Media capture/analog TV support
|
||||
#
|
||||
CONFIG_VIDEO_IVTV=m
|
||||
# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
|
||||
CONFIG_VIDEO_IVTV_ALSA=m
|
||||
CONFIG_VIDEO_FB_IVTV=m
|
||||
CONFIG_VIDEO_HEXIUM_GEMINI=m
|
||||
|
@ -5369,6 +5439,7 @@ CONFIG_DVB_RTL2832=m
|
|||
CONFIG_DVB_RTL2832_SDR=m
|
||||
CONFIG_DVB_SI2168=m
|
||||
CONFIG_DVB_AS102_FE=m
|
||||
CONFIG_DVB_ZD1301_DEMOD=m
|
||||
CONFIG_DVB_GP8PSK_FE=m
|
||||
|
||||
#
|
||||
|
@ -5457,11 +5528,13 @@ CONFIG_VGA_SWITCHEROO=y
|
|||
CONFIG_DRM=m
|
||||
CONFIG_DRM_MIPI_DSI=y
|
||||
# CONFIG_DRM_DP_AUX_CHARDEV is not set
|
||||
# CONFIG_DRM_DEBUG_MM_SELFTEST is not set
|
||||
CONFIG_DRM_KMS_HELPER=m
|
||||
CONFIG_DRM_KMS_FB_HELPER=y
|
||||
CONFIG_DRM_FBDEV_EMULATION=y
|
||||
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
|
||||
CONFIG_DRM_TTM=m
|
||||
CONFIG_DRM_VM=y
|
||||
|
||||
#
|
||||
# I2C encoder or helper chips
|
||||
|
@ -5497,6 +5570,7 @@ CONFIG_DRM_I915_USERPTR=y
|
|||
#
|
||||
# CONFIG_DRM_I915_WERROR is not set
|
||||
# CONFIG_DRM_I915_DEBUG is not set
|
||||
# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
|
||||
CONFIG_DRM_VGEM=m
|
||||
CONFIG_DRM_VMWGFX=m
|
||||
CONFIG_DRM_VMWGFX_FBCON=y
|
||||
|
@ -5523,7 +5597,9 @@ CONFIG_DRM_BRIDGE=y
|
|||
CONFIG_DRM_ANALOGIX_ANX78XX=m
|
||||
CONFIG_HSA_AMD=m
|
||||
CONFIG_DRM_HISI_HIBMC=m
|
||||
# CONFIG_DRM_TINYDRM is not set
|
||||
# CONFIG_DRM_LEGACY is not set
|
||||
# CONFIG_DRM_LIB_RANDOM is not set
|
||||
|
||||
#
|
||||
# Frame buffer Devices
|
||||
|
@ -5541,6 +5617,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
|
|||
CONFIG_FB_SYS_FILLRECT=m
|
||||
CONFIG_FB_SYS_COPYAREA=m
|
||||
CONFIG_FB_SYS_IMAGEBLIT=m
|
||||
# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
|
||||
# CONFIG_FB_FOREIGN_ENDIAN is not set
|
||||
CONFIG_FB_SYS_FOPS=m
|
||||
CONFIG_FB_DEFERRED_IO=y
|
||||
|
@ -5896,7 +5973,7 @@ CONFIG_SND_SOC_FSL_SPDIF=m
|
|||
CONFIG_SND_SOC_FSL_ESAI=m
|
||||
CONFIG_SND_SOC_IMX_AUDMUX=m
|
||||
# CONFIG_SND_SOC_IMG is not set
|
||||
CONFIG_SND_SST_MFLD_PLATFORM=m
|
||||
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
|
||||
CONFIG_SND_SST_IPC=m
|
||||
CONFIG_SND_SST_IPC_ACPI=m
|
||||
CONFIG_SND_SOC_INTEL_SST=m
|
||||
|
@ -5907,6 +5984,7 @@ CONFIG_SND_SOC_INTEL_HASWELL=m
|
|||
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
|
||||
|
@ -5955,6 +6033,8 @@ CONFIG_SND_SOC_DA7219=m
|
|||
CONFIG_SND_SOC_DMIC=m
|
||||
CONFIG_SND_SOC_HDMI_CODEC=m
|
||||
CONFIG_SND_SOC_ES8328=m
|
||||
CONFIG_SND_SOC_ES8328_I2C=m
|
||||
CONFIG_SND_SOC_ES8328_SPI=m
|
||||
CONFIG_SND_SOC_GTM601=m
|
||||
CONFIG_SND_SOC_HDAC_HDMI=m
|
||||
CONFIG_SND_SOC_INNO_RK3036=m
|
||||
|
@ -5984,7 +6064,8 @@ CONFIG_SND_SOC_RT5640=m
|
|||
CONFIG_SND_SOC_RT5645=m
|
||||
CONFIG_SND_SOC_RT5651=m
|
||||
CONFIG_SND_SOC_RT5670=m
|
||||
# CONFIG_SND_SOC_RT5677_SPI is not set
|
||||
CONFIG_SND_SOC_RT5677=m
|
||||
CONFIG_SND_SOC_RT5677_SPI=m
|
||||
CONFIG_SND_SOC_SGTL5000=m
|
||||
CONFIG_SND_SOC_SI476X=m
|
||||
CONFIG_SND_SOC_SIGMADSP=m
|
||||
|
@ -6030,11 +6111,14 @@ CONFIG_SND_SOC_WM8962=m
|
|||
CONFIG_SND_SOC_WM8974=m
|
||||
CONFIG_SND_SOC_WM8978=m
|
||||
CONFIG_SND_SOC_WM8985=m
|
||||
CONFIG_SND_SOC_NAU8540=m
|
||||
CONFIG_SND_SOC_NAU8810=m
|
||||
CONFIG_SND_SOC_NAU8825=m
|
||||
CONFIG_SND_SOC_TPA6130A2=m
|
||||
CONFIG_SND_SIMPLE_CARD_UTILS=m
|
||||
CONFIG_SND_SIMPLE_CARD=m
|
||||
CONFIG_SND_X86=y
|
||||
CONFIG_HDMI_LPE_AUDIO=m
|
||||
# CONFIG_SOUND_PRIME is not set
|
||||
CONFIG_AC97_BUS=m
|
||||
|
||||
|
@ -6300,6 +6384,7 @@ CONFIG_USB_CHIPIDEA=m
|
|||
CONFIG_USB_CHIPIDEA_PCI=m
|
||||
CONFIG_USB_CHIPIDEA_UDC=y
|
||||
CONFIG_USB_CHIPIDEA_HOST=y
|
||||
CONFIG_USB_CHIPIDEA_ULPI=y
|
||||
CONFIG_USB_ISP1760=m
|
||||
CONFIG_USB_ISP1760_HCD=y
|
||||
CONFIG_USB_ISP1761_UDC=y
|
||||
|
@ -6377,6 +6462,7 @@ CONFIG_USB_SERIAL_XSENS_MT=m
|
|||
CONFIG_USB_SERIAL_WISHBONE=m
|
||||
CONFIG_USB_SERIAL_SSU100=m
|
||||
CONFIG_USB_SERIAL_QT2=m
|
||||
CONFIG_USB_SERIAL_UPD78F0730=m
|
||||
CONFIG_USB_SERIAL_DEBUG=m
|
||||
|
||||
#
|
||||
|
@ -6404,6 +6490,7 @@ CONFIG_USB_EHSET_TEST_FIXTURE=m
|
|||
CONFIG_USB_ISIGHTFW=m
|
||||
CONFIG_USB_YUREX=m
|
||||
CONFIG_USB_EZUSB_FX2=m
|
||||
CONFIG_USB_HUB_USB251XB=m
|
||||
CONFIG_USB_HSIC_USB3503=m
|
||||
CONFIG_USB_HSIC_USB4604=m
|
||||
CONFIG_USB_LINK_LAYER_TEST=m
|
||||
|
@ -6579,6 +6666,7 @@ CONFIG_MEMSTICK_REALTEK_USB=m
|
|||
CONFIG_NEW_LEDS=y
|
||||
CONFIG_LEDS_CLASS=y
|
||||
CONFIG_LEDS_CLASS_FLASH=m
|
||||
# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
|
||||
|
||||
#
|
||||
# LED drivers
|
||||
|
@ -6686,6 +6774,7 @@ CONFIG_INFINIBAND_HFI1=m
|
|||
CONFIG_HFI1_VERBS_31BIT_PSN=y
|
||||
# CONFIG_SDMA_VERBOSITY is not set
|
||||
CONFIG_INFINIBAND_QEDR=m
|
||||
CONFIG_INFINIBAND_BNXT_RE=m
|
||||
CONFIG_EDAC_ATOMIC_SCRUB=y
|
||||
CONFIG_EDAC_SUPPORT=y
|
||||
CONFIG_EDAC=y
|
||||
|
@ -6708,6 +6797,7 @@ CONFIG_EDAC_I5100=m
|
|||
CONFIG_EDAC_I7300=m
|
||||
CONFIG_EDAC_SBRIDGE=m
|
||||
CONFIG_EDAC_SKX=m
|
||||
CONFIG_EDAC_PND2=m
|
||||
CONFIG_RTC_LIB=y
|
||||
CONFIG_RTC_MC146818_LIB=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
|
@ -7208,9 +7298,6 @@ CONFIG_STAGING_MEDIA=y
|
|||
CONFIG_I2C_BCM2048=m
|
||||
CONFIG_DVB_CXD2099=m
|
||||
CONFIG_LIRC_STAGING=y
|
||||
CONFIG_LIRC_BT829=m
|
||||
CONFIG_LIRC_IMON=m
|
||||
CONFIG_LIRC_PARALLEL=m
|
||||
CONFIG_LIRC_SASEM=m
|
||||
CONFIG_LIRC_SIR=m
|
||||
CONFIG_LIRC_ZILOG=m
|
||||
|
@ -7283,10 +7370,6 @@ CONFIG_AIM_V4L2=m
|
|||
CONFIG_HDM_DIM2=m
|
||||
CONFIG_HDM_I2C=m
|
||||
CONFIG_HDM_USB=m
|
||||
|
||||
#
|
||||
# Old ISDN4Linux (deprecated)
|
||||
#
|
||||
CONFIG_KS7010=m
|
||||
# CONFIG_GREYBUS is not set
|
||||
CONFIG_X86_PLATFORM_DEVICES=y
|
||||
|
@ -7357,6 +7440,9 @@ CONFIG_INTEL_PUNIT_IPC=m
|
|||
CONFIG_INTEL_TELEMETRY=m
|
||||
# CONFIG_MLX_PLATFORM is not set
|
||||
CONFIG_MLX_CPLD_PLATFORM=m
|
||||
# CONFIG_INTEL_TURBO_MAX_3 is not set
|
||||
# CONFIG_SILEAD_DMI is not set
|
||||
CONFIG_PMC_ATOM=y
|
||||
CONFIG_CHROME_PLATFORMS=y
|
||||
CONFIG_CHROMEOS_LAPTOP=m
|
||||
CONFIG_CHROMEOS_PSTORE=m
|
||||
|
@ -7382,13 +7468,6 @@ CONFIG_COMMON_CLK_PALMAS=m
|
|||
CONFIG_COMMON_CLK_PWM=m
|
||||
# CONFIG_COMMON_CLK_PXA is not set
|
||||
# CONFIG_COMMON_CLK_PIC32 is not set
|
||||
# CONFIG_COMMON_CLK_MT2701 is not set
|
||||
# CONFIG_COMMON_CLK_MT2701_MMSYS is not set
|
||||
# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set
|
||||
# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set
|
||||
# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
|
||||
# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
|
||||
# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
|
||||
|
||||
#
|
||||
# Hardware Spinlock drivers
|
||||
|
@ -7442,6 +7521,7 @@ CONFIG_REMOTEPROC=m
|
|||
#
|
||||
# CONFIG_SUNXI_SRAM is not set
|
||||
CONFIG_SOC_TI=y
|
||||
# CONFIG_SOC_ZTE is not set
|
||||
CONFIG_PM_DEVFREQ=y
|
||||
|
||||
#
|
||||
|
@ -7466,6 +7546,7 @@ CONFIG_EXTCON_ADC_JACK=m
|
|||
CONFIG_EXTCON_ARIZONA=m
|
||||
CONFIG_EXTCON_AXP288=m
|
||||
CONFIG_EXTCON_GPIO=m
|
||||
CONFIG_EXTCON_INTEL_INT3496=m
|
||||
CONFIG_EXTCON_MAX14577=m
|
||||
CONFIG_EXTCON_MAX3355=m
|
||||
CONFIG_EXTCON_MAX77693=m
|
||||
|
@ -7542,10 +7623,12 @@ CONFIG_AXP288_ADC=m
|
|||
CONFIG_CC10001_ADC=m
|
||||
CONFIG_DA9150_GPADC=m
|
||||
CONFIG_HI8435=m
|
||||
CONFIG_HX711=m
|
||||
CONFIG_INA2XX_ADC=m
|
||||
CONFIG_LP8788_ADC=m
|
||||
CONFIG_LTC2485=m
|
||||
CONFIG_MAX1027=m
|
||||
CONFIG_MAX11100=m
|
||||
CONFIG_MAX1363=m
|
||||
CONFIG_MCP320X=m
|
||||
CONFIG_MCP3422=m
|
||||
|
@ -7560,7 +7643,9 @@ CONFIG_TI_ADC12138=m
|
|||
CONFIG_TI_ADC128S052=m
|
||||
CONFIG_TI_ADC161S626=m
|
||||
CONFIG_TI_ADS1015=m
|
||||
CONFIG_TI_ADS7950=m
|
||||
CONFIG_TI_AM335X_ADC=m
|
||||
CONFIG_TI_TLC4541=m
|
||||
CONFIG_TWL4030_MADC=m
|
||||
CONFIG_TWL6030_GPADC=m
|
||||
CONFIG_VIPERBOARD_ADC=m
|
||||
|
@ -7658,6 +7743,8 @@ CONFIG_BMG160=m
|
|||
CONFIG_BMG160_I2C=m
|
||||
CONFIG_BMG160_SPI=m
|
||||
CONFIG_HID_SENSOR_GYRO_3D=m
|
||||
CONFIG_MPU3050=m
|
||||
CONFIG_MPU3050_I2C=m
|
||||
CONFIG_IIO_ST_GYRO_3AXIS=m
|
||||
CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
|
||||
CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
|
||||
|
@ -7699,6 +7786,9 @@ CONFIG_KMX61=m
|
|||
CONFIG_INV_MPU6050_IIO=m
|
||||
CONFIG_INV_MPU6050_I2C=m
|
||||
CONFIG_INV_MPU6050_SPI=m
|
||||
CONFIG_IIO_ST_LSM6DSX=m
|
||||
CONFIG_IIO_ST_LSM6DSX_I2C=m
|
||||
CONFIG_IIO_ST_LSM6DSX_SPI=m
|
||||
CONFIG_IIO_ADIS_LIB=m
|
||||
CONFIG_IIO_ADIS_LIB_BUFFER=y
|
||||
|
||||
|
@ -7775,6 +7865,7 @@ CONFIG_IIO_SYSFS_TRIGGER=m
|
|||
# Digital potentiometers
|
||||
#
|
||||
CONFIG_DS1803=m
|
||||
CONFIG_MAX5481=m
|
||||
CONFIG_MAX5487=m
|
||||
CONFIG_MCP4131=m
|
||||
CONFIG_MCP4531=m
|
||||
|
@ -7792,6 +7883,7 @@ CONFIG_ABP060MG=m
|
|||
CONFIG_BMP280=m
|
||||
CONFIG_BMP280_I2C=m
|
||||
CONFIG_BMP280_SPI=m
|
||||
CONFIG_IIO_CROS_EC_BARO=m
|
||||
CONFIG_HID_SENSOR_PRESS=m
|
||||
CONFIG_HP03=m
|
||||
CONFIG_MPL115=m
|
||||
|
@ -7817,10 +7909,11 @@ CONFIG_ZPA2326_SPI=m
|
|||
CONFIG_AS3935=m
|
||||
|
||||
#
|
||||
# Proximity sensors
|
||||
# Proximity and distance sensors
|
||||
#
|
||||
CONFIG_LIDAR_LITE_V2=m
|
||||
CONFIG_SX9500=m
|
||||
CONFIG_SRF08=m
|
||||
|
||||
#
|
||||
# Temperature sensors
|
||||
|
@ -7828,6 +7921,7 @@ CONFIG_SX9500=m
|
|||
CONFIG_MAXIM_THERMOCOUPLE=m
|
||||
CONFIG_MLX90614=m
|
||||
CONFIG_TMP006=m
|
||||
CONFIG_TMP007=m
|
||||
CONFIG_TSYS01=m
|
||||
CONFIG_TSYS02D=m
|
||||
CONFIG_NTB=m
|
||||
|
@ -7900,6 +7994,8 @@ CONFIG_PHY_SAMSUNG_USB2=m
|
|||
# CONFIG_PHY_EXYNOS4210_USB2 is not set
|
||||
# CONFIG_PHY_EXYNOS4X12_USB2 is not set
|
||||
# CONFIG_PHY_EXYNOS5250_USB2 is not set
|
||||
CONFIG_PHY_QCOM_USB_HS=m
|
||||
CONFIG_PHY_QCOM_USB_HSIC=m
|
||||
CONFIG_PHY_TUSB1210=m
|
||||
CONFIG_POWERCAP=y
|
||||
CONFIG_INTEL_RAPL=m
|
||||
|
@ -7949,10 +8045,14 @@ CONFIG_INTEL_TH_PTI=m
|
|||
#
|
||||
CONFIG_FPGA=m
|
||||
|
||||
#
|
||||
# FSI support
|
||||
#
|
||||
# CONFIG_FSI is not set
|
||||
|
||||
#
|
||||
# Firmware Drivers
|
||||
#
|
||||
# CONFIG_ARM_SCPI_PROTOCOL is not set
|
||||
CONFIG_EDD=y
|
||||
CONFIG_EDD_OFF=y
|
||||
CONFIG_FIRMWARE_MEMMAP=y
|
||||
|
@ -8370,6 +8470,7 @@ CONFIG_FRAME_POINTER=y
|
|||
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
|
||||
CONFIG_MAGIC_SYSRQ=y
|
||||
CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
|
||||
CONFIG_MAGIC_SYSRQ_SERIAL=y
|
||||
CONFIG_DEBUG_KERNEL=y
|
||||
|
||||
#
|
||||
|
@ -8379,6 +8480,7 @@ CONFIG_DEBUG_KERNEL=y
|
|||
# CONFIG_DEBUG_PAGEALLOC is not set
|
||||
# CONFIG_PAGE_POISONING is not set
|
||||
# CONFIG_DEBUG_PAGE_REF is not set
|
||||
# CONFIG_DEBUG_RODATA_TEST is not set
|
||||
# CONFIG_DEBUG_OBJECTS is not set
|
||||
# CONFIG_SLUB_DEBUG_ON is not set
|
||||
# CONFIG_SLUB_STATS is not set
|
||||
|
@ -8386,6 +8488,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
|
|||
# CONFIG_DEBUG_KMEMLEAK is not set
|
||||
# CONFIG_DEBUG_STACK_USAGE is not set
|
||||
# CONFIG_DEBUG_VM is not set
|
||||
CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
|
||||
# CONFIG_DEBUG_VIRTUAL is not set
|
||||
# CONFIG_DEBUG_MEMORY_INIT is not set
|
||||
CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
|
||||
|
@ -8421,7 +8524,6 @@ CONFIG_SCHED_INFO=y
|
|||
CONFIG_SCHEDSTATS=y
|
||||
CONFIG_SCHED_STACK_END_CHECK=y
|
||||
# CONFIG_DEBUG_TIMEKEEPING is not set
|
||||
CONFIG_TIMER_STATS=y
|
||||
|
||||
#
|
||||
# Lock Debugging (spinlocks, mutexes, etc...)
|
||||
|
@ -8436,6 +8538,7 @@ CONFIG_TIMER_STATS=y
|
|||
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
|
||||
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
|
||||
CONFIG_LOCK_TORTURE_TEST=m
|
||||
CONFIG_WW_MUTEX_SELFTEST=m
|
||||
CONFIG_STACKTRACE=y
|
||||
# CONFIG_DEBUG_KOBJECT is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
|
@ -8497,8 +8600,8 @@ CONFIG_BRANCH_PROFILE_NONE=y
|
|||
# CONFIG_PROFILE_ALL_BRANCHES is not set
|
||||
CONFIG_STACK_TRACER=y
|
||||
CONFIG_BLK_DEV_IO_TRACE=y
|
||||
CONFIG_KPROBE_EVENT=y
|
||||
CONFIG_UPROBE_EVENT=y
|
||||
CONFIG_KPROBE_EVENTS=y
|
||||
# CONFIG_UPROBE_EVENTS is not set
|
||||
CONFIG_BPF_EVENTS=y
|
||||
CONFIG_PROBE_EVENTS=y
|
||||
CONFIG_DYNAMIC_FTRACE=y
|
||||
|
@ -8520,6 +8623,7 @@ CONFIG_TRACING_EVENTS_GPIO=y
|
|||
#
|
||||
# CONFIG_LKDTM is not set
|
||||
# CONFIG_TEST_LIST_SORT is not set
|
||||
# CONFIG_TEST_SORT is not set
|
||||
# CONFIG_KPROBES_SANITY_TEST is not set
|
||||
# CONFIG_BACKTRACE_SELF_TEST is not set
|
||||
CONFIG_RBTREE_TEST=m
|
||||
|
@ -8535,6 +8639,7 @@ CONFIG_TEST_BITMAP=m
|
|||
CONFIG_TEST_UUID=m
|
||||
# CONFIG_TEST_RHASHTABLE is not set
|
||||
CONFIG_TEST_HASH=m
|
||||
CONFIG_TEST_PARMAN=m
|
||||
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
|
||||
# CONFIG_DMA_API_DEBUG is not set
|
||||
CONFIG_TEST_LKM=m
|
||||
|
@ -8568,10 +8673,7 @@ CONFIG_EARLY_PRINTK_EFI=y
|
|||
# CONFIG_X86_PTDUMP_CORE is not set
|
||||
# CONFIG_X86_PTDUMP is not set
|
||||
# CONFIG_EFI_PGT_DUMP is not set
|
||||
# CONFIG_DEBUG_RODATA_TEST is not set
|
||||
# CONFIG_DEBUG_WX is not set
|
||||
CONFIG_DEBUG_SET_MODULE_RONX=y
|
||||
# CONFIG_DEBUG_NX_TEST is not set
|
||||
CONFIG_DOUBLEFAULT=y
|
||||
# CONFIG_DEBUG_TLBFLUSH is not set
|
||||
# CONFIG_IOMMU_DEBUG is not set
|
||||
|
@ -8616,6 +8718,7 @@ CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
|
|||
CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
|
||||
# CONFIG_STATIC_USERMODEHELPER is not set
|
||||
CONFIG_SECURITY_SELINUX=y
|
||||
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
||||
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
|
||||
|
@ -8637,6 +8740,7 @@ CONFIG_SECURITY_APPARMOR=y
|
|||
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
|
||||
CONFIG_SECURITY_APPARMOR_HASH=y
|
||||
CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
|
||||
# CONFIG_SECURITY_APPARMOR_DEBUG is not set
|
||||
# CONFIG_SECURITY_LOADPIN is not set
|
||||
CONFIG_SECURITY_YAMA=y
|
||||
CONFIG_INTEGRITY=y
|
||||
|
@ -8718,6 +8822,7 @@ CONFIG_CRYPTO_TEST=m
|
|||
CONFIG_CRYPTO_ABLK_HELPER=m
|
||||
CONFIG_CRYPTO_SIMD=m
|
||||
CONFIG_CRYPTO_GLUE_HELPER_X86=m
|
||||
CONFIG_CRYPTO_ENGINE=m
|
||||
|
||||
#
|
||||
# Authenticated Encryption with Associated Data
|
||||
|
@ -8785,6 +8890,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
|
|||
# Ciphers
|
||||
#
|
||||
CONFIG_CRYPTO_AES=y
|
||||
CONFIG_CRYPTO_AES_TI=m
|
||||
CONFIG_CRYPTO_AES_X86_64=m
|
||||
CONFIG_CRYPTO_AES_NI_INTEL=m
|
||||
CONFIG_CRYPTO_ANUBIS=m
|
||||
|
@ -8974,6 +9080,8 @@ CONFIG_ASSOCIATIVE_ARRAY=y
|
|||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT_MAP=y
|
||||
CONFIG_HAS_DMA=y
|
||||
# CONFIG_DMA_NOOP_OPS is not set
|
||||
CONFIG_DMA_VIRT_OPS=y
|
||||
CONFIG_CHECK_SIGNATURE=y
|
||||
CONFIG_CPU_RMAP=y
|
||||
CONFIG_DQL=y
|
||||
|
@ -8999,3 +9107,4 @@ CONFIG_ARCH_HAS_SG_CHAIN=y
|
|||
CONFIG_ARCH_HAS_PMEM_API=y
|
||||
CONFIG_ARCH_HAS_MMIO_FLUSH=y
|
||||
CONFIG_SBITMAP=y
|
||||
CONFIG_PARMAN=m
|
|
@ -5,6 +5,7 @@
|
|||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017 Kei Kebreau <kei@openmailbox.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -55,7 +56,7 @@
|
|||
(define-public duplicity
|
||||
(package
|
||||
(name "duplicity")
|
||||
(version "0.7.11")
|
||||
(version "0.7.12")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -65,7 +66,7 @@
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01zcq9cwn4pvj68rihgjvcdgccnxvz4jrba38sbv6nqz19cs2ixh"))))
|
||||
"1rhgrz2lm9vbfdp2raykrih1c6n2lw5jd572z4dsz488m52avjqi"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("util-linux" ,util-linux) ;setsid command, for the tests
|
||||
|
@ -117,7 +118,7 @@ spying and/or modification by the server.")
|
|||
(define-public par2cmdline
|
||||
(package
|
||||
(name "par2cmdline")
|
||||
(version "0.6.14")
|
||||
(version "0.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/Parchive/par2cmdline/archive/v"
|
||||
|
@ -125,21 +126,14 @@ spying and/or modification by the server.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ykfb7ar0x0flfdgf6i8xphyv5b93dalbjj2jb6hx7sdjax33n1g"))
|
||||
;; This test merely needs a file to test recovery on, but
|
||||
;; /dev/random is essentially /dev/urandom plus minimum entropy
|
||||
;; locking, making the test hang indefinitely. This change is
|
||||
;; already upstream: remove on upgrade to future 0.6.15.
|
||||
;; https://github.com/Parchive/par2cmdline/commit/27723a678f780da82c79b98592592009c779a4fb
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(substitute* "tests/test20" (("if=/dev/random") "if=/dev/urandom")))))
|
||||
"1m9vnv3pg0nds47raq2rd2kfpaad1sc10hv40hll5byksqlbfxyq"))))
|
||||
(native-inputs
|
||||
`(("automake" ,automake)
|
||||
("autoconf" ,autoconf)))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
`(#:parallel-tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'autoreconf
|
||||
(lambda _ (zero? (system* "autoreconf" "-vfi")))))))
|
||||
|
@ -241,6 +235,20 @@ archive. In particular, note that there is currently no built-in support for
|
|||
random access nor for in-place modification.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define libarchive-3.3.1
|
||||
(package
|
||||
(inherit libarchive)
|
||||
(name "libarchive")
|
||||
(version "3.3.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://libarchive.org/downloads/libarchive-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rr40hxlm9vy5z2zb5w7pyfkgd1a4s061qapm83s19accb8mpji9"))))))
|
||||
|
||||
(define-public rdup
|
||||
(package
|
||||
(name "rdup")
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -345,6 +346,29 @@ functionality beyond that which is outlined in the POSIX standard.")
|
|||
(license gpl3+)
|
||||
(home-page "https://www.gnu.org/software/coreutils/")))
|
||||
|
||||
;; We add version 8.27 here for use in (gnu system) due to a time
|
||||
;; zone bug in `date' versions 8.25 - 8.26.
|
||||
;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=23035
|
||||
;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26238
|
||||
(define-public coreutils-8.27
|
||||
(package
|
||||
(inherit coreutils)
|
||||
(version "8.27")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/coreutils/coreutils-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0sv547572iq8ayy8klir4hnngnx92a9nsazmf1wgzfc7xr4x74c8"))))
|
||||
(arguments
|
||||
(if (string-prefix? "arm" (or (%current-target-system)
|
||||
(%current-system)))
|
||||
(substitute-keyword-arguments (package-arguments coreutils)
|
||||
((#:phases phases)
|
||||
`(alist-delete 'patch-cut-test ,phases)))
|
||||
(package-arguments coreutils)))))
|
||||
|
||||
(define-public coreutils-minimal
|
||||
;; Coreutils without its optional dependencies.
|
||||
(package
|
||||
|
@ -622,6 +646,19 @@ store.")
|
|||
;; 4.7.1.
|
||||
((" -lgcc_s") ""))
|
||||
|
||||
;; Apply patch only on i686.
|
||||
;; TODO: Move the patch to 'patches' in the next update cycle.
|
||||
,@(if (string-prefix? "i686" (or (%current-target-system)
|
||||
(%current-system)))
|
||||
`((unless (zero? (system* "patch" "-p1" "--force"
|
||||
"--input"
|
||||
(or (assoc-ref native-inputs
|
||||
"glibc-memchr-overflow-i686.patch")
|
||||
(assoc-ref inputs
|
||||
"glibc-memchr-overflow-i686.patch"))))
|
||||
(error "patch failed for glibc-memchr-overflow-i686.patch")))
|
||||
'())
|
||||
|
||||
;; Have `system' use that Bash.
|
||||
(substitute* "sysdeps/posix/system.c"
|
||||
(("#define[[:blank:]]+SHELL_PATH.*$")
|
||||
|
@ -665,7 +702,15 @@ store.")
|
|||
;; install the message catalogs, with 'msgfmt'.
|
||||
(native-inputs `(("texinfo" ,texinfo)
|
||||
("perl" ,perl)
|
||||
("gettext" ,gettext-minimal)))
|
||||
("gettext" ,gettext-minimal)
|
||||
|
||||
;; Apply this patch only on i686 to avoid a full rebuild.
|
||||
;; TODO: Move to 'patches' in the next update cycle.
|
||||
,@(if (string-prefix? "i686" (or (%current-target-system)
|
||||
(%current-system)))
|
||||
`(("glibc-memchr-overflow-i686.patch"
|
||||
,(search-patch "glibc-memchr-overflow-i686.patch")))
|
||||
'())))
|
||||
|
||||
(native-search-paths
|
||||
;; Search path for packages that provide locale data. This is useful
|
||||
|
@ -713,35 +758,98 @@ with the Linux kernel.")
|
|||
((#:phases original-phases)
|
||||
;; Add libmachuser.so and libhurduser.so to libc.so's search path.
|
||||
;; See <http://lists.gnu.org/archive/html/bug-hurd/2015-07/msg00051.html>.
|
||||
`(alist-cons-after
|
||||
'install 'augment-libc.so
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out")))
|
||||
(substitute* (string-append out "/lib/libc.so")
|
||||
(("/[^ ]+/lib/libc.so.0.3")
|
||||
(string-append out "/lib/libc.so.0.3" " libmachuser.so" " libhurduser.so"))))
|
||||
#t)
|
||||
(alist-cons-after
|
||||
'pre-configure 'pre-configure-set-pwd
|
||||
(lambda _
|
||||
;; Use the right 'pwd'.
|
||||
(substitute* "configure"
|
||||
(("/bin/pwd") "pwd")))
|
||||
(alist-replace
|
||||
'build
|
||||
(lambda _
|
||||
;; Force mach/hurd/libpthread subdirs to build first in order to avoid
|
||||
;; linking errors.
|
||||
;; See <https://lists.gnu.org/archive/html/bug-hurd/2016-11/msg00045.html>
|
||||
(let ((-j (list "-j" (number->string (parallel-job-count)))))
|
||||
(let-syntax ((make (syntax-rules ()
|
||||
((_ target)
|
||||
(zero? (apply system* "make" target -j))))))
|
||||
(and (make "mach/subdir_lib")
|
||||
(make "hurd/subdir_lib")
|
||||
(make "libpthread/subdir_lib")
|
||||
(zero? (apply system* "make" -j))))))
|
||||
,original-phases))))
|
||||
`(modify-phases ,original-phases
|
||||
;; TODO: This is almost an exact copy of the phase of the same name
|
||||
;; in glibc/linux. The only difference is that the i686 patch is
|
||||
;; not applied here. In the next update cycle the patch moves to
|
||||
;; the patches field and this overwritten phase won't be needed any
|
||||
;; more.
|
||||
(replace 'pre-configure
|
||||
(lambda* (#:key inputs native-inputs outputs
|
||||
#:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
;; FIXME: Normally we would look it up only in INPUTS
|
||||
;; but cross-base uses it as a native input.
|
||||
(bash (or (assoc-ref inputs "static-bash")
|
||||
(assoc-ref native-inputs "static-bash"))))
|
||||
;; Install the rpc data base file under `$out/etc/rpc'.
|
||||
;; FIXME: Use installFlags = [ "sysconfdir=$(out)/etc" ];
|
||||
(substitute* "sunrpc/Makefile"
|
||||
(("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix)
|
||||
(string-append out "/etc/rpc" suffix "\n"))
|
||||
(("^install-others =.*$")
|
||||
(string-append "install-others = " out "/etc/rpc\n")))
|
||||
|
||||
(substitute* "Makeconfig"
|
||||
;; According to
|
||||
;; <http://www.linuxfromscratch.org/lfs/view/stable/chapter05/glibc.html>,
|
||||
;; linking against libgcc_s is not needed with GCC
|
||||
;; 4.7.1.
|
||||
((" -lgcc_s") ""))
|
||||
|
||||
;; Have `system' use that Bash.
|
||||
(substitute* "sysdeps/posix/system.c"
|
||||
(("#define[[:blank:]]+SHELL_PATH.*$")
|
||||
(format #f "#define SHELL_PATH \"~a/bin/bash\"\n"
|
||||
bash)))
|
||||
|
||||
;; Same for `popen'.
|
||||
(substitute* "libio/iopopen.c"
|
||||
(("/bin/sh")
|
||||
(string-append bash "/bin/sh")))
|
||||
|
||||
;; Same for the shell used by the 'exec' functions for
|
||||
;; scripts that lack a shebang.
|
||||
(substitute* (find-files "." "^paths\\.h$")
|
||||
(("#define[[:blank:]]+_PATH_BSHELL[[:blank:]].*$")
|
||||
(string-append "#define _PATH_BSHELL \""
|
||||
bash "/bin/sh\"\n")))
|
||||
|
||||
;; Nscd uses __DATE__ and __TIME__ to create a string to
|
||||
;; make sure the client and server come from the same
|
||||
;; libc. Use something deterministic instead.
|
||||
(substitute* "nscd/nscd_stat.c"
|
||||
(("static const char compilation\\[21\\] =.*$")
|
||||
(string-append
|
||||
"static const char compilation[21] = \""
|
||||
(string-take (basename out) 20) "\";\n")))
|
||||
|
||||
;; Make sure we don't retain a reference to the
|
||||
;; bootstrap Perl.
|
||||
(substitute* "malloc/mtrace.pl"
|
||||
(("^#!.*")
|
||||
;; The shebang can be omitted, because there's the
|
||||
;; "bilingual" eval/exec magic at the top of the file.
|
||||
"")
|
||||
(("exec @PERL@")
|
||||
"exec perl")))))
|
||||
(add-after 'install 'augment-libc.so
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out")))
|
||||
(substitute* (string-append out "/lib/libc.so")
|
||||
(("/[^ ]+/lib/libc.so.0.3")
|
||||
(string-append out "/lib/libc.so.0.3" " libmachuser.so" " libhurduser.so"))))
|
||||
#t))
|
||||
(add-after 'pre-configure 'pre-configure-set-pwd
|
||||
(lambda _
|
||||
;; Use the right 'pwd'.
|
||||
(substitute* "configure"
|
||||
(("/bin/pwd") "pwd"))
|
||||
#t))
|
||||
(replace 'build
|
||||
(lambda _
|
||||
;; Force mach/hurd/libpthread subdirs to build first in order to avoid
|
||||
;; linking errors.
|
||||
;; See <https://lists.gnu.org/archive/html/bug-hurd/2016-11/msg00045.html>
|
||||
(let ((-j (list "-j" (number->string (parallel-job-count)))))
|
||||
(let-syntax ((make (syntax-rules ()
|
||||
((_ target)
|
||||
(zero? (apply system* "make" target -j))))))
|
||||
(and (make "mach/subdir_lib")
|
||||
(make "hurd/subdir_lib")
|
||||
(make "libpthread/subdir_lib")
|
||||
(zero? (apply system* "make" -j)))))))))
|
||||
((#:configure-flags original-configure-flags)
|
||||
`(append (list "--host=i586-pc-gnu"
|
||||
|
||||
|
@ -981,7 +1089,7 @@ command.")
|
|||
(define-public tzdata
|
||||
(package
|
||||
(name "tzdata")
|
||||
(version "2017a")
|
||||
(version "2017b")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -989,7 +1097,7 @@ command.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1mmv4rvcs12lrvgghw4fidczvb69yv69cmzknghcvw1c196mqfnz"))))
|
||||
"11l0s43vx33dcs78p80122i8s5s9l1sjwkzzwh66njd35r92l97q"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f
|
||||
|
@ -1037,7 +1145,7 @@ command.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1b1q7gnlsh5hjgs5065pvajd37rmbc3k9b8cgzad1vcrifswdwh2"))))))
|
||||
"0h1d567gn8l3iqgyadcswwdy2yh07nhz3lfl8ds8saz2ajxka5sd"))))))
|
||||
(home-page "https://www.iana.org/time-zones")
|
||||
(synopsis "Database of current and historical time zones")
|
||||
(description "The Time Zone Database (often called tz or zoneinfo)
|
||||
|
@ -1082,7 +1190,14 @@ and daylight-saving rules.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0y1ij745r4p48mxq84rax40p10ln7fc7m243p8k8sia519i3dxfc"))))
|
||||
"0y1ij745r4p48mxq84rax40p10ln7fc7m243p8k8sia519i3dxfc"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Work around "declared gets" error on glibc systems (fixed by
|
||||
;; Gnulib commit 66712c23388e93e5c518ebc8515140fa0c807348.)
|
||||
'(substitute* "srclib/stdio.in.h"
|
||||
(("^#undef gets") "")
|
||||
(("^_GL_WARN_ON_USE \\(gets.*") "")))))
|
||||
(build-system gnu-build-system)
|
||||
(synopsis "Character set conversion library")
|
||||
(description
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(define-public fio
|
||||
(package
|
||||
(name "fio")
|
||||
(version "2.18")
|
||||
(version "2.20")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -38,7 +38,7 @@
|
|||
"fio-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"08kx2mh556xby9saayrbynwrkmh4v8wwrw759nbv025ch3xbw79n"))))
|
||||
"15vgbzlcjd21bi9ahlbs8h9ca4raw5qgi711n802qmagjdjbmlxw"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:test-target "test"
|
||||
|
@ -78,8 +78,8 @@
|
|||
(dst (string-append newbin "/" file)))
|
||||
(link src dst)
|
||||
(delete-file src)))
|
||||
'("fio2gnuplot" "fio_latency2csv.py"
|
||||
"fiologparser_hist.py" "fiologparser.py"))
|
||||
'("fio2gnuplot" "fiologparser_hist.py"
|
||||
"fiologparser.py"))
|
||||
;; Make sure numpy et.al is found.
|
||||
(wrap-program (string-append newbin "/fiologparser_hist.py")
|
||||
`("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -63,17 +63,13 @@
|
|||
(define-public grub
|
||||
(package
|
||||
(name "grub")
|
||||
(version "2.02rc1")
|
||||
(version "2.02")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"ftp://alpha.gnu.org/gnu/grub/grub-"
|
||||
"2.02~rc1"
|
||||
".tar.xz"))
|
||||
(file-name (string-append name "-" version ".tar.xz"))
|
||||
(uri (string-append "mirror://gnu/grub/grub-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0y02v19x9sb5jvj740f604vvi5j1rx8pily1jk0l64bdp7lkjlj4"))))
|
||||
"03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
|
|
|
@ -179,6 +179,7 @@ successful, or false to signal an error."
|
|||
((string=? system "avr") "no-ld.so")
|
||||
((string=? system "propeller-elf") "no-ld.so")
|
||||
((string=? system "i686-mingw") "no-ld.so")
|
||||
((string=? system "vc4-elf") "no-ld.so")
|
||||
|
||||
(else (error "dynamic linker name not known for this system"
|
||||
system))))
|
||||
|
|
|
@ -0,0 +1,92 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Corentin Bocquillon <corentin@nybble.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 build-tools)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages ninja)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system python))
|
||||
|
||||
(define-public bam
|
||||
(package
|
||||
(name "bam")
|
||||
(version "0.4.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://github.com/downloads/matricks/"
|
||||
"bam/bam-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0z90wvyd4nfl7mybdrv9dsd4caaikc6fxw801b72gqi1m9q0c0sn"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(zero? (system* "bash" "make_unix.sh"))))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(zero? (system* "python" "scripts/test.py"))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
|
||||
(mkdir-p bin)
|
||||
(install-file "bam" bin)
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("python" ,python-2)))
|
||||
(home-page "https://matricks.github.io/bam/")
|
||||
(synopsis "Fast and flexible build system")
|
||||
(description "Bam is a fast and flexible build system. Bam uses Lua to
|
||||
describe the build process. It takes its inspiration for the script files
|
||||
from scons. While scons focuses on being 100% correct when building, bam
|
||||
makes a few sacrifices to acquire fast full and incremental build times.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public meson
|
||||
(package
|
||||
(name "meson")
|
||||
(version "0.40.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/mesonbuild/meson/"
|
||||
"archive/" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0yl6iryh89nn6hzhwv7kg16ki1chh9h0x1yk1y130h87iq42a35r"))))
|
||||
(build-system python-build-system)
|
||||
(inputs `(("ninja", ninja)))
|
||||
(home-page "https://mesonbuild.com/")
|
||||
(synopsis "Build system designed to be fast and user-friendly")
|
||||
(description
|
||||
"The Meson build system is focused on user-friendliness and speed.
|
||||
It can compile code written in C, C++, Fortran, Java, Rust, and other
|
||||
languages. Meson provides features comparable to those of the
|
||||
Autoconf/Automake/make combo. Build specifications, also known as @dfn{Meson
|
||||
files}, are written in a custom domain-specific language (DSL) that resembles
|
||||
Python.")
|
||||
(license license:asl2.0)))
|
|
@ -85,13 +85,13 @@ data units.")
|
|||
(define-public khal
|
||||
(package
|
||||
(name "khal")
|
||||
(version "0.9.3")
|
||||
(version "0.9.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "khal" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1iva6cw2x3p2jzjj6bsyx7lc7yxin4fsd37j9c96j07x16p4imyl"))))
|
||||
"0fvv0kjym9q8v20zbpr5m8ig65b8hva4p0c935qsdvgdni68jidr"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -26,7 +27,7 @@
|
|||
(define-module (gnu packages cdrom)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix packages)
|
||||
#:use-module ((guix licenses) #:select (lgpl2.1+ gpl2 gpl2+ gpl3+))
|
||||
#:use-module ((guix licenses) #:select (lgpl2.1+ gpl2 gpl2+ gpl3+ cddl1.0))
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
|
@ -36,19 +37,29 @@
|
|||
#:use-module (gnu packages audio)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages zip)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages docbook)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages man)
|
||||
#:use-module (gnu packages m4)
|
||||
#:use-module (gnu packages mp3)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages elf)
|
||||
#:use-module (gnu packages wxwidgets)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages photo)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages wget)
|
||||
#:use-module (gnu packages xiph))
|
||||
|
||||
|
@ -197,6 +208,104 @@ extra-robust data verification, synchronization, error handling and scratch
|
|||
reconstruction capability.")
|
||||
(license gpl2))) ; libraries under lgpl2.1
|
||||
|
||||
(define-public cdrtools
|
||||
(package
|
||||
(name "cdrtools")
|
||||
(version "3.01")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://sourceforge/cdrtools/cdrtools-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"03w6ypsmwwy4d7vh6zgwpc60v541vc5ywp8bdb758hbc4yv2wa7d"))
|
||||
(patches (search-patches "cdrtools-3.01-mkisofs-isoinfo.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
;; XXX cdrtools bundles a modified, relicensed early version of cdparanoia.
|
||||
(inputs
|
||||
`(("linux-headers" ,linux-libre-headers)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-before 'build 'set-linux-headers
|
||||
(lambda _
|
||||
(substitute* "autoconf/configure"
|
||||
(("/usr/src/linux")
|
||||
(assoc-ref %build-inputs "linux-headers")))
|
||||
#t))
|
||||
(add-before 'build 'substitute-dirs
|
||||
(lambda _
|
||||
(substitute* (append (find-files "DEFAULTS" "^Defaults\\.")
|
||||
(find-files "DEFAULTS_ENG" "^Defaults\\.")
|
||||
(find-files "TEMPLATES" "^Defaults\\."))
|
||||
(("/opt/schily") (assoc-ref %outputs "out")))
|
||||
#t))
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(zero?
|
||||
(system* "make" "CONFIG_SHELL=sh" "CCOM=gcc" "RM=rm"))))
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(zero?
|
||||
(system* "make"
|
||||
"RM=rm" "LN=ln" "SYMLINK=ln -s"
|
||||
(string-append "INS_BASE=" (assoc-ref %outputs "out"))
|
||||
(string-append "INS_RBASE=" (assoc-ref %outputs "out"))
|
||||
"install" )))))
|
||||
#:tests? #f)) ; no tests
|
||||
(synopsis "Command line utilities to manipulate and burn CD/DVD/BD images")
|
||||
(description "cdrtools is a collection of command line utilities to create
|
||||
CD's, DVD's or Blue Ray discs. The most important components are
|
||||
@command{cdrecord}, a burning program, @command{cdda2wav}, a CD audio ripper
|
||||
which uses libparanoia, and @command{mkisofs}, which can create various disc
|
||||
images.")
|
||||
(home-page "http://cdrtools.sourceforge.net/private/cdrecord.html")
|
||||
|
||||
;; mkisofs is GPL, the other programs are CDDL.
|
||||
(license (list cddl1.0 gpl2))))
|
||||
|
||||
(define-public dvd+rw-tools
|
||||
(package
|
||||
(name "dvd+rw-tools")
|
||||
(version "7.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jkjvvnjcyxpql97xjjx0kwvy70kxpiznr2zpjy2hhci5s10zmpq"))
|
||||
(patches (search-patches "dvd+rw-tools-add-include.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("cdrtools" ,cdrtools)))
|
||||
(native-inputs
|
||||
`(("m4" ,m4)))
|
||||
(arguments
|
||||
`(#:tests? #f ; No tests.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda _ (setenv "prefix" (assoc-ref %outputs "out")) #t))
|
||||
(add-before 'build 'embed-mkisofs
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; We use sed --in-place because substitute* cannot handle the
|
||||
;; character encoding used by growisofs.c.
|
||||
(zero? (system* "sed" "-i" "-e"
|
||||
(string-append
|
||||
"s,\"mkisofs\","
|
||||
"\"" (which "mkisofs") "\",")
|
||||
"growisofs.c")))))))
|
||||
(home-page "http://fy.chalmers.se/~appro/linux/DVD+RW/")
|
||||
(synopsis "DVD and Blu-ray Disc burning tools")
|
||||
(description "dvd+rw-tools, mostly known for its command
|
||||
@command{growisofs}, is a collection of DVD and Blu-ray Disc burning tools.
|
||||
It requires another program, such as @command{mkisofs}, @command{genisoimage},
|
||||
or @command{xorrisofs} to create ISO 9660 images.")
|
||||
(license gpl2)))
|
||||
|
||||
(define-public dvdisaster
|
||||
(package
|
||||
(name "dvdisaster")
|
||||
|
@ -238,6 +347,70 @@ depend on the file system of the medium. The maximum error correction
|
|||
capacity is user-selectable.")
|
||||
(license gpl2+)))
|
||||
|
||||
(define-public dvdstyler
|
||||
(package
|
||||
(name "dvdstyler")
|
||||
(version "3.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/dvdstyler/dvdstyler/"
|
||||
version "/DVDStyler-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1j432kszmwmsd3nz398h5514dbm5vsrn4rr3iil72ckjj1h3i00q"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list (string-append "XMLTO="
|
||||
(assoc-ref %build-inputs "xmlto")
|
||||
"/bin/xmlto"
|
||||
" --searchpath "
|
||||
(assoc-ref %build-inputs "docbook-xsl")
|
||||
"/xml/xsl/docbook-xsl-1.79.1/htmlhelp:"
|
||||
(assoc-ref %build-inputs "docbook-xml")
|
||||
"/xml/dtd/docbook"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'wrap-program
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(wrap-program (string-append (assoc-ref outputs "out") "/bin/dvdstyler")
|
||||
`("PATH" ":" prefix
|
||||
(,(string-join
|
||||
(map (lambda (in) (string-append (assoc-ref inputs in) "/bin"))
|
||||
'("cdrtools" "dvdauthor" "dvd+rw-tools" "ffmpeg"))
|
||||
":"))))
|
||||
#t)))
|
||||
#:tests? #f)) ; No tests.
|
||||
(inputs ; TODO package bundled wxvillalib
|
||||
`(("wxwidgets" ,wxwidgets-3.1)
|
||||
("wssvg" ,wxsvg)
|
||||
("dbus" ,dbus)
|
||||
("cdrtools" ,cdrtools)
|
||||
("dvd+rw-tools" ,dvd+rw-tools)
|
||||
("dvdauthor" ,dvdauthor)
|
||||
("eudev" ,eudev)
|
||||
("fontconfig" ,fontconfig)
|
||||
("libexif" ,libexif)
|
||||
("libjpeg" ,libjpeg)
|
||||
("ffmpeg" ,ffmpeg)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("flex" ,flex)
|
||||
("python" ,python-2)
|
||||
("xmlto" ,xmlto)
|
||||
("gettext" ,gnu-gettext)
|
||||
("docbook-xml" ,docbook-xml)
|
||||
("docbook-xsl" ,docbook-xsl)
|
||||
("zip" ,zip)))
|
||||
(synopsis "DVD authoring application")
|
||||
(description "DVDStyler is a DVD authoring application which allows users
|
||||
to burn video files in many formats to DVD discs, complete with individually
|
||||
designed menus. It can be used to create professional-looking DVD's with
|
||||
custom buttons, backgrounds and animations, from within a user-friendly
|
||||
graphical interface.")
|
||||
(home-page "https://www.dvdstyler.org")
|
||||
(license gpl2)))
|
||||
|
||||
(define-public libcue
|
||||
(package
|
||||
(name "libcue")
|
||||
|
|
|
@ -74,7 +74,7 @@
|
|||
(define-public nss-certs
|
||||
(package
|
||||
(name "nss-certs")
|
||||
(version "3.29.3")
|
||||
(version "3.30.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (let ((version-with-underscores
|
||||
|
@ -85,7 +85,7 @@
|
|||
"nss-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"1sz1r2iml9bhd4iqiqz75gii855a25895vpy9scjky0y4lqwrp9m"))))
|
||||
"096frzvyp3z257x84rxknscfgsbavzh2a0gyibx7kvmw4vzpfjhd"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"))
|
||||
(native-inputs
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -180,13 +181,13 @@ format.")
|
|||
(define-public cppcheck
|
||||
(package
|
||||
(name "cppcheck")
|
||||
(version "1.77")
|
||||
(version "1.78")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/danmar/cppcheck/archive/"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1fn26p0xvfrdbhxjhy6aqhkk63n3fvrdb2ygcn9wg4vaandhmbkn"))
|
||||
(base32 "1dnizw0rfj6faqgnmg8qh6njr9q89j8brhba7qmx2i47vl0qj11i"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system cmake-build-system)
|
||||
(home-page "http://cppcheck.sourceforge.net")
|
||||
|
|
|
@ -187,23 +187,28 @@ their dependencies.")
|
|||
(license l:gpl3+))))
|
||||
|
||||
(define-public cuirass
|
||||
(let ((commit "8c811abb3174b44601b8996a1fe1718f37d7bd14")
|
||||
(revision "5"))
|
||||
(let ((commit "870e8d6ad3415ac61c52e57095fcc6164023a0fc")
|
||||
(revision "6"))
|
||||
(package
|
||||
(name "cuirass")
|
||||
(version (string-append "0.0.1-" revision "." (string-take commit 7)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://notabug.org/mthl/cuirass")
|
||||
(url "https://git.savannah.gnu.org/git/guix/guix-cuirass.git")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0kz2ys01xlmxagsfr9qf3p212vm31wfl76rvxa7ii5804aidlz5n"))))
|
||||
"0lp5a5p42k7lml15lbmmd7az9i0gw5kips3sh3awd2z79h0w2knw"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
'(#:modules ((guix build utils)
|
||||
(guix build gnu-build-system)
|
||||
(ice-9 rdelim)
|
||||
(ice-9 popen))
|
||||
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'disable-repo-tests
|
||||
(λ _
|
||||
|
@ -221,9 +226,17 @@ their dependencies.")
|
|||
(sqlite (assoc-ref inputs "guile-sqlite3"))
|
||||
(git (assoc-ref inputs "git"))
|
||||
(guix (assoc-ref inputs "guix"))
|
||||
(mods (string-append json "/share/guile/site/2.0:"
|
||||
sqlite "/share/guile/site/2.0:"
|
||||
guix "/share/guile/site/2.0")))
|
||||
(guile (assoc-ref %build-inputs "guile"))
|
||||
(effective (read-line
|
||||
(open-pipe* OPEN_READ
|
||||
(string-append guile "/bin/guile")
|
||||
"-c" "(display (effective-version))")))
|
||||
(mods (string-append json "/share/guile/site/"
|
||||
effective ":"
|
||||
sqlite "/share/guile/site/"
|
||||
effective ":"
|
||||
guix "/share/guile/site/"
|
||||
effective)))
|
||||
;; Make sure 'cuirass' can find the 'git' and 'evaluate'
|
||||
;; commands, as well as the relevant Guile modules.
|
||||
(wrap-program (string-append out "/bin/cuirass")
|
||||
|
@ -233,7 +246,7 @@ their dependencies.")
|
|||
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,mods)))
|
||||
#t))))))
|
||||
(inputs
|
||||
`(("guile" ,guile-2.0)
|
||||
`(("guile" ,guile-2.2)
|
||||
("guile-json" ,guile-json)
|
||||
("guile-sqlite3" ,guile-sqlite3)
|
||||
("guix" ,guix)
|
||||
|
@ -247,5 +260,5 @@ their dependencies.")
|
|||
(description
|
||||
"Cuirass is a continuous integration tool using GNU Guix. It is
|
||||
intended as a replacement for Hydra.")
|
||||
(home-page "https://notabug.org/mthl/cuirass")
|
||||
(home-page "https://www.gnu.org/software/guix/")
|
||||
(license l:gpl3+))))
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
(define-module (gnu packages commencement)
|
||||
#:use-module ((guix licenses)
|
||||
#:select (gpl3+ lgpl2.0+ public-domain))
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages bootstrap)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
|
@ -509,7 +510,14 @@ the bootstrap environment."
|
|||
(propagated-inputs `(("kernel-headers" ,(kernel-headers-boot0))))
|
||||
(native-inputs
|
||||
`(("texinfo" ,texinfo-boot0)
|
||||
("perl" ,perl-boot0)))
|
||||
("perl" ,perl-boot0)
|
||||
;; Apply this patch only on i686 to avoid a full rebuild.
|
||||
;; TODO: Remove in the next update cycle.
|
||||
,@(if (string-prefix? "i686" (or (%current-target-system)
|
||||
(%current-system)))
|
||||
`(("glibc-memchr-overflow-i686.patch"
|
||||
,(search-patch "glibc-memchr-overflow-i686.patch")))
|
||||
'())))
|
||||
(inputs
|
||||
`(;; The boot inputs. That includes the bootstrap libc. We don't want
|
||||
;; it in $CPATH, hence the 'pre-configure' phase above.
|
||||
|
@ -1015,4 +1023,7 @@ and binaries, plus debugging symbols in the 'debug' output), and Binutils.")
|
|||
(define-public gcc-toolchain-6
|
||||
(gcc-toolchain gcc-6))
|
||||
|
||||
(define-public gcc-toolchain-7
|
||||
(gcc-toolchain gcc-7))
|
||||
|
||||
;;; commencement.scm ends here
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
||||
;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
|
||||
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
|
||||
|
@ -605,7 +605,7 @@ decompression of some loosely related file formats used by Microsoft.")
|
|||
(synopsis "Low-level interface to bzip2 compression library")
|
||||
(description "This module provides a Perl interface to the bzip2
|
||||
compression library.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-compress-raw-zlib
|
||||
(package
|
||||
|
@ -640,7 +640,7 @@ GZIP_OS_CODE = AUTO_DETECT"
|
|||
(synopsis "Low-level interface to zlib compression library")
|
||||
(description "This module provides a Perl interface to the zlib
|
||||
compression library.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-io-compress
|
||||
(package
|
||||
|
@ -662,19 +662,21 @@ compression library.")
|
|||
(synopsis "IO Interface to compressed files/buffers")
|
||||
(description "IO-Compress provides a Perl interface to allow reading and
|
||||
writing of compressed data created with the zlib and bzip2 libraries.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public lz4
|
||||
(package
|
||||
(name "lz4")
|
||||
(version "1.7.4.2")
|
||||
(version "1.7.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/Cyan4973/lz4/archive/"
|
||||
(uri (string-append "https://github.com/lz4/lz4/archive/"
|
||||
"v" version ".tar.gz"))
|
||||
(patches (search-patches "lz4-fix-test-failures.patch"))
|
||||
(sha256
|
||||
(base32 "0l39bymif15rmmfz7h6wvrr853rix4wj8wbqq8z8fm49xa7gx9fb"))
|
||||
(base32
|
||||
"0zkykqqjfa1q3ji0qmb1ml3l9063qqfh99agyj3cnb02cg6wm401"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("valgrind" ,valgrind))) ; for tests
|
||||
|
@ -685,7 +687,7 @@ writing of compressed data created with the zlib and bzip2 libraries.")
|
|||
(string-append "PREFIX=" (assoc-ref %outputs "out")))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
(home-page "https://github.com/Cyan4973/lz4")
|
||||
(home-page "https://github.com/lz4/lz4")
|
||||
(synopsis "Compression algorithm focused on speed")
|
||||
(description "LZ4 is a lossless compression algorithm, providing
|
||||
compression speed at 400 MB/s per core (0.16 Bytes/cycle). It also features an
|
||||
|
@ -1172,7 +1174,7 @@ RAR archives.")
|
|||
(define-public zstd
|
||||
(package
|
||||
(name "zstd")
|
||||
(version "1.1.4")
|
||||
(version "1.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/facebook/zstd/archive/v"
|
||||
|
@ -1180,7 +1182,7 @@ RAR archives.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1yxr1y83gphljxaqhwvxbldy1ivx81x93rngiv5l94rmdrc2pbka"))
|
||||
"1yyb8z03z9rw74k1d9dygcqxhx76717xq29agz57d0k3lf9lazja"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove non-free source files.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Mathieu OTHACEHE <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -41,7 +41,7 @@
|
|||
(define-public connman
|
||||
(package
|
||||
(name "connman")
|
||||
(version "1.33")
|
||||
(version "1.34")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -49,7 +49,7 @@
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"187mknq2i907gf8dz0i79359gn1qc9mryvqkcgb280d7dw1ld2dw"))))
|
||||
"07n71wcy1c4cc01ca4dl9k1jpdqr5nsyr33dqf7k87wwfa681859"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -135,7 +135,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
|
|||
(define-public cmst
|
||||
(package
|
||||
(name "cmst")
|
||||
(version "2016.10.03")
|
||||
(version "2017.03.18")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -143,7 +143,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
|
|||
"https://github.com/andrew-bibb/cmst/releases/download/cmst-"
|
||||
version "/cmst-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1xpn4sqnxzpsjjwh9hva9sn55xlryiz2f2mwpyj2l31janj7a082"))))
|
||||
(base32 "16g9byxr1rkmrnzi6sjplpmkr8h6pqj7418jz30czqviw5qlkqwl"))))
|
||||
(inputs
|
||||
`(("qt" ,qt)))
|
||||
(native-inputs
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
(define-public libsodium
|
||||
(package
|
||||
(name "libsodium")
|
||||
(version "1.0.11")
|
||||
(version "1.0.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append
|
||||
|
@ -67,7 +67,7 @@
|
|||
"releases/old/libsodium-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0rf7z6bgpnf8lyz8sph4h43fbb28pmj4dgybf0hsxxj97kdljid1"))))
|
||||
"159givfh5jgli3cifxgssivkklfyfq6lzyjgrx8h4jx5ncdqyr5q"))))
|
||||
(build-system gnu-build-system)
|
||||
(synopsis "Portable NaCl-based crypto library")
|
||||
(description
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
(define-public cryptsetup
|
||||
(package
|
||||
(name "cryptsetup")
|
||||
(version "1.7.4")
|
||||
(version "1.7.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v"
|
||||
|
@ -40,7 +40,7 @@
|
|||
"/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"05m0ric8anrkl62smk8rafgi30j9jrxw20qzss9gnf4sywz8kkvw"))))
|
||||
"1gail831j826lmpdx2gsc83lp3br6wfnwh3vqwxaa1nn1lfwsc1b"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libgcrypt" ,libgcrypt)
|
||||
|
@ -81,8 +81,8 @@ files). This assumes LIBRARY uses Libtool."
|
|||
'(#:configure-flags '("--disable-shared"
|
||||
"--enable-static-cryptsetup"
|
||||
|
||||
;; 'libdevmapper.a' pulls in libpthread and libudev.
|
||||
"LIBS=-ludev -pthread")
|
||||
;; 'libdevmapper.a' pulls in libpthread, libudev and libm.
|
||||
"LIBS=-ludev -pthread -lm")
|
||||
|
||||
#:allowed-references () ;this should be self-contained
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -44,7 +45,7 @@
|
|||
;; Delay to avoid module circularity problems.
|
||||
(define ghostscript/cups
|
||||
(delay
|
||||
(package (inherit ghostscript)
|
||||
(package/inherit ghostscript
|
||||
(name "ghostscript-with-cups")
|
||||
(inputs `(("cups" ,cups-minimal)
|
||||
,@(package-inputs ghostscript))))))
|
||||
|
|
|
@ -40,14 +40,14 @@
|
|||
(define-public curl
|
||||
(package
|
||||
(name "curl")
|
||||
(version "7.53.1")
|
||||
(version "7.54.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://curl.haxx.se/download/curl-"
|
||||
version ".tar.lzma"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qpm4qj5llr8f5bbl185gpjqknj47nzhvxd8j1vm6asgk3sly4jb"))))
|
||||
"02h7qhl8ynp75g1vcaw18ks0gp7nahvvkqck19pb1q0kkw1scsnd"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"doc")) ;1.2 MiB of man3 pages
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -52,6 +53,7 @@
|
|||
#:use-module (gnu packages jemalloc)
|
||||
#:use-module (gnu packages language)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages man)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages parallel)
|
||||
#:use-module (gnu packages pcre)
|
||||
|
@ -290,7 +292,7 @@ mapping from string keys to string values.")
|
|||
(define-public mysql
|
||||
(package
|
||||
(name "mysql")
|
||||
(version "5.7.17")
|
||||
(version "5.7.18")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append
|
||||
|
@ -302,7 +304,7 @@ mapping from string keys to string values.")
|
|||
name "-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0lcn9cm36n14g22bcppq5vf4nxbrl3khvlsp9hsixqdfb3l27gyf"))))
|
||||
"18m1mr55k9zmvnyqs0wr50csqsz3scs09fykh60wsml6c3np2p8b"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -370,7 +372,7 @@ Language.")
|
|||
(define-public mariadb
|
||||
(package
|
||||
(name "mariadb")
|
||||
(version "10.1.22")
|
||||
(version "10.1.23")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://downloads.mariadb.org/f/"
|
||||
|
@ -378,11 +380,20 @@ Language.")
|
|||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kk674mx2bf22yivvzv1al5gdg9kyxar47m282bylb6kg8p5gc5w"))))
|
||||
"1gq08dj9skr0gli1nj7a8wl92w8lmmqy0sbxvkmy79dz4i713n2l"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
'("-DBUILD_CONFIG=mysql_release"
|
||||
;; Linking with libarchive fails, like this:
|
||||
|
||||
;; ld: /gnu/store/...-libarchive-3.2.2/lib/libarchive.a(archive_entry.o):
|
||||
;; relocation R_X86_64_32 against `.bss' can not be used when
|
||||
;; making a shared object; recompile with -fPIC
|
||||
|
||||
;; For now, disable the features that that use libarchive (xtrabackup).
|
||||
"-DWITH_LIBARCHIVE=OFF"
|
||||
|
||||
"-DDEFAULT_CHARSET=utf8"
|
||||
"-DDEFAULT_COLLATION=utf8_general_ci"
|
||||
"-DMYSQL_DATADIR=/var/lib/mysql"
|
||||
|
@ -438,14 +449,14 @@ as a drop-in replacement of MySQL.")
|
|||
(define-public postgresql
|
||||
(package
|
||||
(name "postgresql")
|
||||
(version "9.5.6")
|
||||
(version "9.6.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
|
||||
version "/postgresql-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bz1b9r249ffjfvldaiah2g78ccwq30ddh8hdvlq61z26inmz7mv"))))
|
||||
"1imrjp4vfslxj5rrvphcrrk21zv8kqw3gacmwradixh1d5rv6i8n"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -575,48 +586,51 @@ types are supported, as is encryption.")
|
|||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:make-flags (list "CC=gcc"
|
||||
;; Make the resulting library position-independent so the
|
||||
;; static version can be included in shared objects.
|
||||
"EXTRA_CXXFLAGS=-fPIC"
|
||||
`(#:make-flags (list "CC=gcc"
|
||||
(string-append "INSTALL_PATH="
|
||||
(assoc-ref %outputs "out")))
|
||||
;; Many tests fail on 32-bit platforms. There are multiple reports about
|
||||
;; this upstream, but it's not going to be supported any time soon.
|
||||
#:tests? (let ((system ,(or (%current-target-system)
|
||||
(%current-system))))
|
||||
(or (string-prefix? "x86_64-linux" system)
|
||||
(string-prefix? "aarch64-linux" system)))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-Makefile
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
(("build_tools/gnu_parallel") "parallel")
|
||||
;; Don't depend on the static library when installing.
|
||||
(("install: install-static")
|
||||
"install: install-shared")
|
||||
(("#!/bin/sh") (string-append "#!" (which "sh"))))
|
||||
#t))
|
||||
(delete 'configure)
|
||||
;; The default target is only needed for tests and built on demand.
|
||||
(delete 'build)
|
||||
(add-before 'check 'disable-optimizations
|
||||
(lambda _
|
||||
;; Prevent the build from passing '-march=native' to the compiler.
|
||||
(setenv "PORTABLE" "1")
|
||||
#t))
|
||||
(add-before 'check 'disable-failing-tests
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
;; This test fails with GCC-5 and is unmaintained.
|
||||
;; https://github.com/facebook/rocksdb/issues/2148
|
||||
(("^[[:blank:]]+spatial_db_test[[:blank:]]+\\\\") "\\")
|
||||
;; These tests reliably fail due to "Too many open files".
|
||||
(("^[[:blank:]]+env_test[[:blank:]]+\\\\") "\\")
|
||||
(("^[[:blank:]]+persistent_cache_test[[:blank:]]+\\\\") "\\"))
|
||||
#t))
|
||||
(add-after
|
||||
'check 'build-release-libraries
|
||||
;; The 'check' target depends on the default target which is compiled
|
||||
;; with debug symbols. The 'install' target depends on shared and
|
||||
;; static release targets so we build them here for clarity.
|
||||
;; TODO: Add debug output.
|
||||
(lambda* (#:key (make-flags '()) #:allow-other-keys)
|
||||
;; Prevent the build from adding machine-specific optimizations.
|
||||
;; This does not work if passed as a make flag...
|
||||
(setenv "PORTABLE" "1")
|
||||
(and (zero? (apply system* "make" "static_lib" make-flags))
|
||||
(zero? (apply system* "make" "shared_lib" make-flags)))))
|
||||
(add-after 'install 'delete-static-library
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(lib (string-append out "/lib")))
|
||||
(for-each (lambda (file)
|
||||
(delete-file file))
|
||||
(find-files lib "\\.l?a$"))
|
||||
#t))))))
|
||||
(add-after 'check 'build-release-libraries
|
||||
;; The default build target is a debug build for tests. The
|
||||
;; install target depends on "shared_lib" and "static_lib"
|
||||
;; targets for release builds so we build them here for clarity.
|
||||
;; TODO: Add debug output.
|
||||
(lambda* (#:key (make-flags '()) #:allow-other-keys)
|
||||
(zero? (apply system* "make" "shared_lib" make-flags)))))))
|
||||
(native-inputs
|
||||
`(("parallel" ,parallel)
|
||||
("perl" ,perl)
|
||||
|
@ -796,7 +810,7 @@ extremely small.")
|
|||
(synopsis "Database independent interface for Perl")
|
||||
(description "This package provides an database interface for Perl.")
|
||||
(home-page "http://search.cpan.org/dist/DBI")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-dbix-class
|
||||
(package
|
||||
|
@ -850,7 +864,7 @@ still providing access to as many of the capabilities of the database as
|
|||
possible, including retrieving related records from multiple tables in a
|
||||
single query, \"JOIN\", \"LEFT JOIN\", \"COUNT\", \"DISTINCT\", \"GROUP BY\",
|
||||
\"ORDER BY\" and \"HAVING\" support.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-dbix-class-cursor-cached
|
||||
(package
|
||||
|
@ -875,7 +889,7 @@ single query, \"JOIN\", \"LEFT JOIN\", \"COUNT\", \"DISTINCT\", \"GROUP BY\",
|
|||
(synopsis "Cursor with built-in caching support")
|
||||
(description "DBIx::Class::Cursor::Cached provides a cursor class with
|
||||
built-in caching support.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-dbix-class-introspectablem2m
|
||||
(package
|
||||
|
@ -900,7 +914,7 @@ relationships are actually just a collection of convenience methods installed
|
|||
to bridge two relationships. This DBIx::Class component can be used to store
|
||||
all relevant information about these non-relationships so they can later be
|
||||
introspected and examined.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-dbix-class-schema-loader
|
||||
(package
|
||||
|
@ -955,12 +969,12 @@ introspected and examined.")
|
|||
(description "DBIx::Class::Schema::Loader automates the definition of a
|
||||
DBIx::Class::Schema by scanning database table definitions and setting up the
|
||||
columns, primary keys, unique constraints and relationships.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-dbd-pg
|
||||
(package
|
||||
(name "perl-dbd-pg")
|
||||
(version "3.5.1")
|
||||
(version "3.5.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -968,7 +982,7 @@ columns, primary keys, unique constraints and relationships.")
|
|||
"DBD-Pg-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0z0kf1kjgbi5f6nr63i2fnrx7629d9lvxg1q8sficwb3zdf1ggzx"))))
|
||||
"03m9w1cd0yyrbqwkwcl92j1cpmasmm69f3hwvcrlfsi5fnwsk63y"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-dbi" ,perl-dbi)))
|
||||
|
@ -979,7 +993,7 @@ columns, primary keys, unique constraints and relationships.")
|
|||
(synopsis "DBI PostgreSQL interface")
|
||||
(description "This package provides a PostgreSQL driver for the Perl5
|
||||
@dfn{Database Interface} (DBI).")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-dbd-mysql
|
||||
(package
|
||||
|
@ -1003,12 +1017,12 @@ columns, primary keys, unique constraints and relationships.")
|
|||
(synopsis "DBI MySQL interface")
|
||||
(description "This package provides a MySQL driver for the Perl5
|
||||
@dfn{Database Interface} (DBI).")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-dbd-sqlite
|
||||
(package
|
||||
(name "perl-dbd-sqlite")
|
||||
(version "1.52")
|
||||
(version "1.54")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1016,7 +1030,7 @@ columns, primary keys, unique constraints and relationships.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kimb2qr1rh07yylbbfybwcizpmy61ck667amypn4clmkfg0knm6"))))
|
||||
"0sbj9lx9syzpknvjv8cz9jndg32qz775vy2prgq305npv3dsca9r"))))
|
||||
(build-system perl-build-system)
|
||||
(inputs `(("sqlite" ,sqlite)))
|
||||
(propagated-inputs `(("perl-dbi" ,perl-dbi)))
|
||||
|
@ -1025,7 +1039,7 @@ columns, primary keys, unique constraints and relationships.")
|
|||
the entire thing in the distribution. So in order to get a fast transaction
|
||||
capable RDBMS working for your Perl project you simply have to install this
|
||||
module, and nothing else.")
|
||||
(license (package-license perl))
|
||||
(license license:perl-license)
|
||||
(home-page "http://search.cpan.org/~ishigaki/DBD-SQLite/lib/DBD/SQLite.pm")))
|
||||
|
||||
(define-public perl-sql-abstract
|
||||
|
@ -1058,7 +1072,7 @@ been modified to make the SQL easier to generate from Perl data structures.
|
|||
The underlying idea is for this module to do what you mean, based on the data
|
||||
structures you provide it, so that you don't have to modify your code every
|
||||
time your data changes.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-sql-splitstatement
|
||||
(package
|
||||
|
@ -1084,7 +1098,7 @@ time your data changes.")
|
|||
(synopsis "Split SQL code into atomic statements")
|
||||
(description "This module tries to split any SQL code, even including
|
||||
non-standard extensions, into the atomic statements it is composed of.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-sql-tokenizer
|
||||
(package
|
||||
|
@ -1104,7 +1118,7 @@ non-standard extensions, into the atomic statements it is composed of.")
|
|||
(description "SQL::Tokenizer is a tokenizer for SQL queries. It does not
|
||||
claim to be a parser or query verifier. It just creates sane tokens from a
|
||||
valid SQL query.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public unixodbc
|
||||
(package
|
||||
|
@ -1275,12 +1289,12 @@ more efficient access and storage of column subsets) and log-structured merge
|
|||
trees (LSM), for sustained throughput under random insert workloads.")
|
||||
(license license:gpl3) ; or GPL-2
|
||||
;; configure.ac: WiredTiger requires a 64-bit build.
|
||||
(supported-systems '("x86_64-linux" "mips64el-linux"))))
|
||||
(supported-systems '("x86_64-linux" "mips64el-linux" "aarch64-linux"))))
|
||||
|
||||
(define-public perl-db-file
|
||||
(package
|
||||
(name "perl-db-file")
|
||||
(version "1.838")
|
||||
(version "1.840")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1290,7 +1304,7 @@ trees (LSM), for sustained throughput under random insert workloads.")
|
|||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0yp5d5zr8dk9g6xdh7ygi5bq63q7nxvhd58dk2i3ki4nb7yv2yh9"))))
|
||||
"1i5jz85z4hpx15lw6ix27pyvrf0ziyh4z33lii4d3wnhz83lg1mp"))))
|
||||
(build-system perl-build-system)
|
||||
(inputs `(("bdb" ,bdb)))
|
||||
(native-inputs `(("perl-test-pod" ,perl-test-pod)))
|
||||
|
@ -1307,7 +1321,7 @@ trees (LSM), for sustained throughput under random insert workloads.")
|
|||
"Perl5 access to Berkeley DB version 1.x")
|
||||
(description
|
||||
"The DB::File module provides Perl bindings to the Berkeley DB version 1.x.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public lmdb
|
||||
(package
|
||||
|
@ -1477,3 +1491,42 @@ for ODBC.")
|
|||
|
||||
(define-public python2-pyodbc-c
|
||||
(package-with-python2 python-pyodbc-c))
|
||||
|
||||
(define-public mdbtools
|
||||
(package
|
||||
(name "mdbtools")
|
||||
(version "0.7.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/brianb/mdbtools/archive/"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"05hbmxcq173kzb899gdi3bz2qcc1vi3n1qbbkwpsvrq7ggf11wyw"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("glib" ,glib)))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)
|
||||
("pkg-config" ,pkg-config)
|
||||
("txt2man" ,txt2man)
|
||||
("which" ,which)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'autoreconf
|
||||
(lambda _
|
||||
(zero? (system* "autoreconf" "-vfi")))))))
|
||||
(home-page "http://mdbtools.sourceforge.net/")
|
||||
(synopsis "Read Microsoft Access databases")
|
||||
(description "MDB Tools is a set of tools and applications to read the
|
||||
proprietary MDB file format used in Microsoft's Access database package. This
|
||||
includes programs to export schema and data from Microsoft's Access database
|
||||
file format to other databases such as MySQL, Oracle, Sybase, PostgreSQL,
|
||||
etc., and an SQL engine for performing simple SQL queries.")
|
||||
(license (list license:lgpl2.0
|
||||
license:gpl2+))))
|
||||
|
|
|
@ -65,7 +65,7 @@ and heaps.")
|
|||
"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.
|
||||
bits per entry. @code{dense_hash_map} is very fast, particularly 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 --
|
||||
|
|
|
@ -27,13 +27,13 @@
|
|||
(define-public radicale
|
||||
(package
|
||||
(name "radicale")
|
||||
(version "1.1.1")
|
||||
(version "1.1.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Radicale" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1c5lv8qca21mndkx350wxv34qypqh6gb4rhzms4anr642clq3jg2"))))
|
||||
"1g20p3998f46ywda7swv0py63wjbrhvk0nrafajlbb6wgzxjmqpb"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ; The tests are not distributed in the PyPi release.
|
||||
|
|
|
@ -1,63 +0,0 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.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 dillo)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages fltk)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu))
|
||||
|
||||
(define-public dillo
|
||||
(package
|
||||
(name "dillo")
|
||||
(version "3.0.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.dillo.org/download/"
|
||||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments `(#:configure-flags '("--enable-ssl" "--enable-ipv6")))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(inputs `(("fltk" ,fltk)
|
||||
("fontconfig" ,fontconfig)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libpng" ,libpng)
|
||||
("libxcursor" ,libxcursor)
|
||||
("libxft" ,libxft)
|
||||
("libxi" ,libxi)
|
||||
("libxinerama" ,libxinerama)
|
||||
("openssl" ,openssl)
|
||||
("perl" ,perl)
|
||||
("zlib" ,zlib)))
|
||||
(synopsis "Very small and fast graphical web browser")
|
||||
(description "Dillo is a minimalistic web browser particularly intended for
|
||||
older or slower computers and embedded systems.")
|
||||
(home-page "http://www.dillo.org")
|
||||
(license license:gpl3+)))
|
|
@ -0,0 +1,82 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.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 direct-connect)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages version-control))
|
||||
|
||||
(define-public linuxdcpp
|
||||
(package
|
||||
(name "linuxdcpp")
|
||||
(version "1.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"12i92hirmwryl1qy0n3jfrpziwzb82f61xca9jcjwyilx502f0b6"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:python ,python-2
|
||||
#:tests? #f ; no tests
|
||||
#:phases
|
||||
;; TODO: Add scons-build-system and use it here.
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'build
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(mkdir-p out)
|
||||
(zero? (system* "scons" (string-append "PREFIX=" out)
|
||||
"-j" (number->string (parallel-job-count)))))))
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(zero? (system* "scons" "install")))))))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("bzip2" ,bzip2)
|
||||
("gtk+" ,gtk+-2)
|
||||
("libglade" ,libglade)
|
||||
("libnotify" ,libnotify)
|
||||
("openssl" ,openssl)))
|
||||
(native-inputs
|
||||
`(("bazaar" ,bazaar)
|
||||
("gettext-minimal" ,gettext-minimal)
|
||||
("pkg-config" ,pkg-config)
|
||||
("scons" ,scons)))
|
||||
(home-page "https://launchpad.net/linuxdcpp/")
|
||||
(synopsis "Direct Connect client")
|
||||
(description "LinuxDC++ is a Direct Connect (DC) client. Direct Connect
|
||||
is a peer-to-peer file-sharing protocol. Clients connect to a central hub
|
||||
where they can chat or share files with one another. Users can view other
|
||||
users' list of shared files or search the hub for files.")
|
||||
(license license:gpl2+)))
|
|
@ -7,6 +7,7 @@
|
|||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -337,3 +338,46 @@ project to detect and manipulate partition tables. Optional file system tools
|
|||
permit managing file systems not included in libparted.")
|
||||
;; The home page says GPLv2, but the source code says GPLv2+.
|
||||
(license license:gpl2+)))
|
||||
|
||||
|
||||
(define-public f3
|
||||
(package
|
||||
(name "f3")
|
||||
(version "6.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/AltraMayor/f3/archive/"
|
||||
"v" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1mgbzc1swvgil45md1336j0aqkmkhwmpxical0ln5g09b2qxsanp"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; no check target
|
||||
#:make-flags (list "CC=gcc"
|
||||
(string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-before 'build 'fix-makefile
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
;; Install without setting owner and group
|
||||
(("\\$\\(INSTALL\\) -oroot -groot ") "$(INSTALL) ")
|
||||
;; also build and install experimental tools
|
||||
(("^all: ") "all: $(EXPERIMENTAL_TARGETS) ")
|
||||
(("^install: ") "install-all: ")
|
||||
(("^install-experimental: ") "install: install-all "))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("eudev" ,eudev)
|
||||
("parted" ,parted)))
|
||||
(home-page "http://oss.digirati.com.br/f3/")
|
||||
(synopsis "Test real capacity of flash memory cards and such.")
|
||||
(description "F3 (Fight Flash Fraud or Fight Fake Flash) tests the full
|
||||
capacity of a flash card (flash drive, flash disk, pendrive). F3 writes to
|
||||
the card and then checks if can read it. It will assure you haven't been sold
|
||||
a card with a smaller capacity than stated.")
|
||||
(license license:gpl3+)))
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
;;; Copyright © 2013 Joshua Grant <tadni@riseup.net>
|
||||
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -23,19 +25,26 @@
|
|||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages kde-frameworks)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xfce)
|
||||
#:use-module (gnu packages xorg))
|
||||
|
||||
(define-public greenisland
|
||||
|
@ -186,6 +195,107 @@ create smooth, animated user interfaces.")
|
|||
;; QML files are MIT licensed and images are CC BY 3.0.
|
||||
(license (list license:gpl2+ license:expat license:cc-by3.0))))
|
||||
|
||||
(define-public lightdm
|
||||
(package
|
||||
(name "lightdm")
|
||||
(version "1.22.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://launchpad.net/lightdm/"
|
||||
(version-major+minor version) "/"
|
||||
version "/+download/lightdm-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0a5bvfl2h7r873al6q7c819h0kg564k9fh51rl6489z6lyvazfg4"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:parallel-tests? #f ; fails when run in parallel
|
||||
#:configure-flags
|
||||
(list "--localstatedir=/var")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-paths
|
||||
(lambda _
|
||||
(substitute* "src/shared-data-manager.c"
|
||||
(("/bin/rm") (which "rm")))
|
||||
(substitute* '("data/users.conf"
|
||||
"common/user-list.c")
|
||||
(("/bin/false") (which "false"))
|
||||
(("/usr/sbin/nologin") (which "nologin")))
|
||||
(substitute* "src/seat.c"
|
||||
(("/bin/sh") (which "sh")))
|
||||
#t))
|
||||
(add-after 'unpack 'disable-broken-tests
|
||||
(lambda _
|
||||
(substitute* "tests/Makefile.in"
|
||||
(("test-sessions-gobject ") "")
|
||||
((" test-sessions-python ") " "))
|
||||
#t))
|
||||
(add-before 'check 'pre-check
|
||||
;; Run test-suite under a dbus session.
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(wrap-program "tests/src/test-python-greeter"
|
||||
`("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
|
||||
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
|
||||
|
||||
;; Avoid printing locale warnings, which trip up the text
|
||||
;; matching tests.
|
||||
(unsetenv "LC_ALL")
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("audit" ,audit)
|
||||
("linux-pam" ,linux-pam)
|
||||
("util-linux" ,util-linux) ; for sbin/nologin
|
||||
("libgcrypt" ,libgcrypt)
|
||||
("libxcb" ,libxcb)))
|
||||
(native-inputs
|
||||
`(("gobject-introspection" ,gobject-introspection)
|
||||
("pkg-config" ,pkg-config)
|
||||
("itstool" ,itstool)
|
||||
("intltool" ,intltool)
|
||||
;; For tests
|
||||
("dbus" ,dbus)
|
||||
("python" ,python-2)
|
||||
("python-pygobject" ,python2-pygobject)))
|
||||
;; Required by liblightdm-gobject-1.pc.
|
||||
(propagated-inputs
|
||||
`(("glib" ,glib)
|
||||
("libx11" ,libx11)
|
||||
("libxklavier" ,libxklavier)))
|
||||
(home-page "https://www.freedesktop.org/wiki/Software/LightDM/")
|
||||
(synopsis "Lightweight display manager")
|
||||
(description "The Light Display Manager (LightDM) is a cross-desktop
|
||||
display manager which supports different greeters.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public lightdm-gtk-greeter
|
||||
(package
|
||||
(name "lightdm-gtk-greeter")
|
||||
(version "2.0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://launchpad.net/lightdm-gtk-greeter/"
|
||||
(version-major+minor version) "/" version
|
||||
"/+download/lightdm-gtk-greeter-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1436sdm83xqhxyr1rzqxhsl8if2xmidlvb341xcv6dv83lyxkrlf"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("exo" ,exo)
|
||||
("intltool" ,intltool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("lightdm" ,lightdm)
|
||||
("gtk+" ,gtk+)))
|
||||
(synopsis "GTK+ greeter for LightDM")
|
||||
(home-page "https://launchpad.net/lightdm-gtk-greeter")
|
||||
(description "This package provides a LightDM greeter implementation using
|
||||
GTK+, lets you select a desktop session and log in to it.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public slim
|
||||
(package
|
||||
(name "slim")
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -24,18 +25,19 @@
|
|||
#:use-module (guix build-system python)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages python))
|
||||
|
||||
(define-public python-django
|
||||
(package
|
||||
(name "python-django")
|
||||
(version "1.10.5")
|
||||
(version "1.10.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Django" version))
|
||||
(sha256
|
||||
(base32
|
||||
"12szjsmnfhh2yr54sfynyjr8vl0q9gb6qak3ayqcifcinrs97f0d"))))
|
||||
"1f5hnn2dzfr5szk4yc47bs4kk2nmrayjcvgpqi2s4l13pjfpfgar"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
@ -80,7 +82,8 @@ development and clean, pragmatic design. It provides many tools for building
|
|||
any Web site. Django focuses on automating as much as possible and adhering
|
||||
to the @dfn{don't repeat yourself} (DRY) principle.")
|
||||
(license license:bsd-3)
|
||||
(properties `((python2-variant . ,(delay python2-django))))))
|
||||
(properties `((python2-variant . ,(delay python2-django))
|
||||
(cpe-name . "django")))))
|
||||
|
||||
(define-public python2-django
|
||||
(let ((base (package-with-python2 (strip-python2-variant python-django))))
|
||||
|
@ -126,13 +129,13 @@ with arguments to the field constructor.")
|
|||
(define-public python-pytest-django
|
||||
(package
|
||||
(name "python-pytest-django")
|
||||
(version "2.9.1")
|
||||
(version "3.1.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pytest-django" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1mmc7zsz3dlhs6sx4sppkj1vgshabi362r1a8b8wpj1qfximpqcb"))))
|
||||
"02932m2sr8x22m4az8syr8g835g4ak77varrnw71n6xakmdcr303"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; FIXME: How to run tests?
|
||||
|
@ -141,7 +144,7 @@ with arguments to the field constructor.")
|
|||
(add-after 'unpack 'patch-setuppy
|
||||
(lambda _
|
||||
(substitute* "setup.py"
|
||||
(("setuptools_scm==1.8.0") "setuptools_scm"))
|
||||
(("setuptools_scm==1.11.1") "setuptools_scm"))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("python-django" ,python-django)
|
||||
|
@ -188,3 +191,506 @@ them do this.")
|
|||
|
||||
(define-public python2-django-filter
|
||||
(package-with-python2 python-django-filter))
|
||||
|
||||
(define-public python-django-allauth
|
||||
(package
|
||||
(name "python-django-allauth")
|
||||
(version "0.30.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-allauth" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1fslqc5qqb0b66yscvkyjwfv8cnbfx5nlkpnwimyb3pf1nc1w7r3"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-openid" ,python-openid)
|
||||
("python-requests" ,python-requests)
|
||||
("python-requests-oauthlib" ,python-requests-oauthlib)))
|
||||
(native-inputs
|
||||
`(("python-mock" ,python-mock)))
|
||||
(inputs
|
||||
`(("python-django" ,python-django)))
|
||||
(home-page "https://github.com/pennersr/django-allauth")
|
||||
(synopsis "Set of Django applications addressing authentication")
|
||||
(description
|
||||
"Integrated set of Django applications addressing authentication,
|
||||
registration, account management as well as 3rd party (social)
|
||||
account authentication.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python2-django-allauth
|
||||
(package-with-python2 python-django-allauth))
|
||||
|
||||
(define-public python-django-gravatar2
|
||||
(package
|
||||
(name "python-django-gravatar2")
|
||||
(version "1.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-gravatar2" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1v4qyj6kms321yw0z2g1kch6b2dskmv6fjd6sfxzwr4xshq9mccl"))))
|
||||
(build-system python-build-system)
|
||||
(inputs
|
||||
`(("python-django" ,python-django)))
|
||||
(home-page "https://github.com/twaddington/django-gravatar")
|
||||
(synopsis "Gravatar support for Django, improved version")
|
||||
(description
|
||||
"Essential Gravatar support for Django. Features helper methods,
|
||||
templatetags and a full test suite.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python2-django-gravatar2
|
||||
(package-with-python2 python-django-gravatar2))
|
||||
|
||||
(define-public python-django-assets
|
||||
(package
|
||||
(name "python-django-assets")
|
||||
(version "0.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-assets" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0y0007fvkn1rdlj2g0y6k1cnkx53kxab3g8i85i0rd58k335p365"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'fix-tests
|
||||
(lambda _
|
||||
(begin
|
||||
;; https://github.com/miracle2k/django-assets/issues/87
|
||||
(substitute* "tests/__init__.py"
|
||||
(("settings.configure.*")
|
||||
(string-append
|
||||
"settings.configure(\n"
|
||||
"INSTALLED_APPS=['django_assets', "
|
||||
"'django.contrib.staticfiles'],\n"
|
||||
"TEMPLATES=[{'BACKEND': "
|
||||
"'django.template.backends.django.DjangoTemplates'}],\n"
|
||||
")\n")))
|
||||
;; These tests fail
|
||||
(substitute* "tests/test_django.py"
|
||||
(("TestLoader") "NoTestLoader"))))))))
|
||||
(native-inputs
|
||||
`(("python-nose" ,python-nose)))
|
||||
(propagated-inputs
|
||||
`(("python-django" ,python-django)
|
||||
("python-webassets" ,python-webassets)))
|
||||
(home-page "https://github.com/miracle2k/django-assets")
|
||||
(synopsis "Asset management for Django")
|
||||
(description
|
||||
"Asset management for Django, to compress and merge CSS and Javascript
|
||||
files. Integrates the webassets library with Django, adding support for
|
||||
merging, minifying and compiling CSS and Javascript files.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public python2-django-assets
|
||||
(package-with-python2 python-django-assets))
|
||||
|
||||
(define-public python-django-jsonfield
|
||||
(package
|
||||
(name "python-django-jsonfield")
|
||||
(version "1.0.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "jsonfield" version))
|
||||
(sha256
|
||||
(base32
|
||||
"19x4lak0hg9c20r7mvf27w7i8r6i4sg2g0ypmlmp2665fnk76zvy"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'fix-tests
|
||||
(lambda _
|
||||
(substitute* "jsonfield/tests.py"
|
||||
(("django.forms.util") "django.forms.utils")))))))
|
||||
(propagated-inputs
|
||||
`(("python-django" ,python-django)))
|
||||
(home-page "https://github.com/bradjasper/django-jsonfield")
|
||||
(synopsis "Store validated JSON in your model")
|
||||
(description
|
||||
"Django-jsonfield is a reusable Django field that allows you to store
|
||||
validated JSON in your model. It silently takes care of serialization. To
|
||||
use, simply add the field to one of your models.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python2-django-jsonfield
|
||||
(package-with-python2 python-django-jsonfield))
|
||||
|
||||
(define-public python-dj-database-url
|
||||
(package
|
||||
(name "python-dj-database-url")
|
||||
(version "0.4.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "dj-database-url" version))
|
||||
(sha256
|
||||
(base32
|
||||
"024zbkc5rli4hia9lz9g8kf1zxhb2gwawj5abf67i7gf8n22v0x6"))))
|
||||
(build-system python-build-system)
|
||||
(home-page "https://github.com/kennethreitz/dj-database-url")
|
||||
(synopsis "Use Database URLs in your Django Application")
|
||||
(description
|
||||
"This simple Django utility allows you to utilize the 12factor inspired
|
||||
DATABASE_URL environment variable to configure your Django application.
|
||||
|
||||
The dj_database_url.config method returns a Django database connection
|
||||
dictionary, populated with all the data specified in your URL. There is also a
|
||||
conn_max_age argument to easily enable Django’s connection pool.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public python2-dj-database-url
|
||||
(package-with-python2 python-dj-database-url))
|
||||
|
||||
(define-public python-django-bulk-update
|
||||
(package
|
||||
(name "python-django-bulk-update")
|
||||
(version "1.1.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-bulk-update" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0mbng9m7swfc0dnidipbzlxfhlfjrv755dlnha5s4m9mgdxb1fhc"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
;; tests don't support django 1.10, but the module seems to work.
|
||||
`(#:tests? #f))
|
||||
(native-inputs
|
||||
`(("six" ,python-six)
|
||||
("jsonfield" ,python-django-jsonfield)
|
||||
("python-dj-database-url" ,python-dj-database-url)))
|
||||
(propagated-inputs
|
||||
`(("python-django" ,python-django)))
|
||||
(home-page "https://github.com/aykut/django-bulk-update")
|
||||
(synopsis "Simple bulk update over Django ORM or with helper function")
|
||||
(description
|
||||
"Simple bulk update over Django ORM or with helper function. This
|
||||
project aims to bulk update given objects using one query over Django ORM.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python2-django-bulk-update
|
||||
(package-with-python2 python-django-bulk-update))
|
||||
|
||||
(define-public python-django-contact-form
|
||||
(package
|
||||
(name "python-django-contact-form")
|
||||
(version "1.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-contact-form" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0az590y56k5ahv4sixrkn54d3a8ig2q2z9pl6s3m4f533mx2gj17"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
;; the next version will need "make test"
|
||||
(and (zero? (system* "flake8" "contact_form"))
|
||||
(zero? (system* "coverage" "run" "contact_form/runtests.py"))
|
||||
(zero? (system* "coverage" "report" "-m" "--fail-under" "0"))))))))
|
||||
(native-inputs
|
||||
`(("python-coverage" ,python-coverage)
|
||||
("python-flake8" ,python-flake8)))
|
||||
(propagated-inputs
|
||||
`(("python-django" ,python-django)))
|
||||
(home-page "https://github.com/ubernostrum/django-contact-form")
|
||||
(synopsis "Contact form for Django")
|
||||
(description
|
||||
"This application provides simple, extensible contact-form functionality
|
||||
for Django sites.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python2-django-contact-form
|
||||
(package-with-python2 python-django-contact-form))
|
||||
|
||||
(define-public python-django-contrib-comments
|
||||
(package
|
||||
(name "python-django-contrib-comments")
|
||||
(version "1.8.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-contrib-comments" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0bxsgw8jrkhg6r5s0z6ksfi4w8yknaqb1s9acmxd9pm3pnsnp5kx"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-django" ,python-django)))
|
||||
(home-page "https://github.com/django/django-contrib-comments")
|
||||
(synopsis "Comments framework")
|
||||
(description
|
||||
"Django used to include a comments framework; since Django 1.6 it's been
|
||||
separated to a separate project. This is that project. This framework can be
|
||||
used to attach comments to any model, so you can use it for comments on blog
|
||||
entries, photos, book chapters, or anything else.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python2-django-contrib-comments
|
||||
(package-with-python2 python-django-contrib-comments))
|
||||
|
||||
(define-public python-django-overextends
|
||||
(package
|
||||
(name "python-django-overextends")
|
||||
(version "0.4.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-overextends" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0qc2pcf3i56pmfxh2jw7k3pgljd8xzficmkl2541n7bkcbngqfzm"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(zero? (system* "./test_project/manage.py" "test")))))))
|
||||
(propagated-inputs
|
||||
`(("python-django" ,python-django)))
|
||||
(native-inputs
|
||||
`(("sphinx-me" ,python-sphinx-me)))
|
||||
(home-page "https://github.com/stephenmcd/django-overextends")
|
||||
(synopsis "Circular template inheritance")
|
||||
(description
|
||||
"A Django reusable app providing the overextends template tag, a drop-in
|
||||
replacement for Django's extends tag, which allows you to use circular template
|
||||
inheritance. The primary use-case for overextends is to simultaneously
|
||||
override and extend templates from other reusable apps, in your own Django
|
||||
project.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public python2-django-overextends
|
||||
(package-with-python2 python-django-overextends))
|
||||
|
||||
(define-public python-django-redis
|
||||
(package
|
||||
(name "python-django-redis")
|
||||
(version "4.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-redis" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0yyyxv8n9l9dhs893jsqwg2cxqkkc79g719n9dzzzqgkzialv1c1"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(and (zero? (system* "redis-server" "--daemonize" "yes"))
|
||||
(with-directory-excursion "tests"
|
||||
(zero? (system* "python" "runtests.py")))))))))
|
||||
(native-inputs
|
||||
`(("python-fakeredis" ,python-fakeredis)
|
||||
("python-hiredis" ,python-hiredis)
|
||||
("python-mock" ,python-mock)
|
||||
("python-msgpack" ,python-msgpack)
|
||||
("redis" ,redis)))
|
||||
(propagated-inputs
|
||||
`(("python-django" ,python-django)
|
||||
("python-redis" ,python-redis)))
|
||||
(home-page "https://github.com/niwibe/django-redis")
|
||||
(synopsis "Full featured redis cache backend for Django")
|
||||
(description
|
||||
"Full featured redis cache backend for Django.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python2-django-redis
|
||||
(package-with-python2 python-django-redis))
|
||||
|
||||
(define-public python-django-rq
|
||||
(package
|
||||
(name "python-django-rq")
|
||||
(version "0.9.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-rq" version))
|
||||
(sha256
|
||||
(base32
|
||||
"04v8ilfdp10bk31fxgh4cn083gsn5m06342cnpm5d10nd8hc0vky"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(and (zero? (system* "redis-server" "--daemonize" "yes"))
|
||||
(zero? (system* "django-admin.py" "test" "django_rq"
|
||||
"--settings=django_rq.test_settings"
|
||||
"--pythonpath="))))))))
|
||||
(native-inputs
|
||||
`(("redis" ,redis)))
|
||||
(propagated-inputs
|
||||
`(("python-django" ,python-django)
|
||||
("python-rq" ,python-rq)))
|
||||
(home-page "https://github.com/ui/django-rq")
|
||||
(synopsis "Django integration with RQ")
|
||||
(description
|
||||
"Django integration with RQ, a Redis based Python queuing library.
|
||||
Django-RQ is a simple app that allows you to configure your queues in django's
|
||||
settings.py and easily use them in your project.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python2-django-rq
|
||||
(package-with-python2 python-django-rq))
|
||||
|
||||
(define-public python-django-sortedm2m
|
||||
(package
|
||||
(name "python-django-sortedm2m")
|
||||
(version "1.3.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-sortedm2m" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0axf765i7b3c2s83nlph47asi8s071dhq8l7y382v1pw785s22vi"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
;; no tests.
|
||||
`(#:tests? #f))
|
||||
(propagated-inputs
|
||||
`(("python-django" ,python-django)))
|
||||
(home-page "https://github.com/gregmuellegger/django-sortedm2m")
|
||||
(synopsis "Drop-in replacement for django's own ManyToManyField")
|
||||
(description
|
||||
"Sortedm2m is a drop-in replacement for django's own ManyToManyField.
|
||||
The provided SortedManyToManyField behaves like the original one but remembers
|
||||
the order of added relations.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python2-django-sortedm2m
|
||||
(package-with-python2 python-django-sortedm2m))
|
||||
|
||||
(define-public python-django-appconf
|
||||
(package
|
||||
(name "python-django-appconf")
|
||||
(version "1.0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-appconf" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0qdjdx35g66xjsc50v0c5h3kg6njs8df33mbjx6j4k1vd3m9lkba"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-django" ,python-django)))
|
||||
(home-page "https://github.com/django-compressor/django-appconf")
|
||||
(synopsis "Handle configuration defaults of packaged Django apps")
|
||||
(description
|
||||
"This app precedes Django's own AppConfig classes that act as \"objects
|
||||
[to] store metadata for an application\" inside Django's app loading mechanism.
|
||||
In other words, they solve a related but different use case than
|
||||
django-appconf and can't easily be used as a replacement. The similarity in
|
||||
name is purely coincidental.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python2-django-appconf
|
||||
(package-with-python2 python-django-appconf))
|
||||
|
||||
(define-public python-django-statici18n
|
||||
(package
|
||||
(name "python-django-statici18n")
|
||||
(version "1.3.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "django-statici18n" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0alcf4g1nv69njhq5k3qw4mfl2k6dc18bik5nk0g1mnp3m8zyz7k"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-django" ,python-django)
|
||||
("django-appconf" ,python-django-appconf)))
|
||||
(home-page "https://github.com/zyegfryed/django-statici18n")
|
||||
(synopsis "Generate JavaScript catalog to static files")
|
||||
(description
|
||||
"A Django app that provides helper for generating JavaScript catalog to
|
||||
static files.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python2-django-statici18n
|
||||
(package-with-python2 python-django-statici18n))
|
||||
|
||||
(define-public pootle
|
||||
(package
|
||||
(name "pootle")
|
||||
(version "2.8.0rc5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Pootle" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0m6qcpkcy22dk3ad5y2k8851kqg2w6vrkywgy4vabwbacd7r1mvn"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(; pootle supports only python2.
|
||||
#:python ,python-2
|
||||
;; tests are not run and fail with "pytest_pootle/data/po/.tmp: No such
|
||||
;; file or directory". If we create this directory,
|
||||
;; pytest_pootle/data/po/terminology.po is missing.
|
||||
#:tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'fix-requirements
|
||||
(lambda _
|
||||
(substitute* "Pootle.egg-info/requires.txt"
|
||||
(("1.7.3") "1.8.0")
|
||||
(("2.0.0") "2.1.0"))
|
||||
(substitute* "requirements/tests.txt"
|
||||
(("==3.0.6") ">=3.0.6"))
|
||||
(substitute* "requirements/base.txt"
|
||||
(("1.7.3") "1.8.0")
|
||||
(("2.0.0") "2.1.0")))))))
|
||||
(propagated-inputs
|
||||
`(("django-allauth" ,python2-django-allauth)
|
||||
("django-assets" ,python2-django-assets)
|
||||
("django-bulk-update" ,python2-django-bulk-update)
|
||||
("django-contact-form" ,python2-django-contact-form)
|
||||
("django-contrib-comments" ,python2-django-contrib-comments)
|
||||
("django-overextends" ,python2-django-overextends)
|
||||
("django-redis" ,python2-django-redis)
|
||||
("django-rq" ,python2-django-rq)
|
||||
("django-sortedm2m" ,python2-django-sortedm2m)
|
||||
("django-statici18n" ,python2-django-statici18n)
|
||||
("babel" ,python2-babel)
|
||||
("cssmin" ,python2-cssmin)
|
||||
("diff-match-patch" ,python2-diff-match-patch)
|
||||
("dirsync" ,python2-dirsync)
|
||||
("elasticsearch" ,python2-elasticsearch)
|
||||
("jsonfield" ,python2-django-jsonfield)
|
||||
("lxml" ,python2-lxml)
|
||||
("dateutil" ,python2-dateutil)
|
||||
("levenshtein" ,python2-levenshtein)
|
||||
("mysqlclient" ,python2-mysqlclient)
|
||||
("psycopg2" ,python2-psycopg2)
|
||||
("pytz" ,python2-pytz)
|
||||
("rq" ,python2-rq)
|
||||
("scandir" ,python2-scandir)
|
||||
("stemming" ,python2-stemming)
|
||||
("translate-toolkit" ,python2-translate-toolkit)))
|
||||
(native-inputs
|
||||
`(("python2-pytest-warnings" ,python2-pytest-warnings)
|
||||
("python2-pytest-django" ,python2-pytest-django)
|
||||
("python2-pytest-catchlog" ,python2-pytest-catchlog)
|
||||
("python2-pytest-cov" ,python2-pytest-cov)
|
||||
("python2-factory-boy" ,python2-factory-boy)))
|
||||
(home-page "http://pootle.translatehouse.org/")
|
||||
(synopsis "Community localization server")
|
||||
(description
|
||||
"Pootle is an online translation and localization tool. It works to
|
||||
lower the barrier of entry, providing tools to enable teams to work towards
|
||||
higher quality while welcoming newcomers.")
|
||||
(license license:gpl3+)))
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
|
||||
;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -87,10 +88,12 @@ and BOOTP/TFTP for network booting of diskless machines.")
|
|||
;; Source files only say GPL2 and GPL3 are allowed.
|
||||
(license (list license:gpl2 license:gpl3))))
|
||||
|
||||
(define-public bind
|
||||
;; 'bind' is the name of a built-in Guile procedure, which is why we choose a
|
||||
;; different name here.
|
||||
(define-public isc-bind
|
||||
(package
|
||||
(name "bind")
|
||||
(version "9.10.4-P6")
|
||||
(version "9.11.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -98,7 +101,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0rgffdm0h6dks0np4h9q4kd8nyb3azrdxw2skqnjzd8ws78vzpx1"))))
|
||||
"1chhphaa4lmfxj9daqsxph5ng4h3qq51jx21rj2i6an8ynah0192"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs `("out" "utils"))
|
||||
(inputs
|
||||
|
@ -149,12 +152,12 @@ high-volume and high-reliability applications. The name BIND stands for
|
|||
\"Berkeley Internet Name Domain\", because the software originated in the early
|
||||
1980s at the University of California at Berkeley.")
|
||||
(home-page "https://www.isc.org/downloads/bind")
|
||||
(license (list license:isc))))
|
||||
(license (list license:mpl2.0))))
|
||||
|
||||
(define-public dnscrypt-proxy
|
||||
(package
|
||||
(name "dnscrypt-proxy")
|
||||
(version "1.9.4")
|
||||
(version "1.9.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -162,7 +165,7 @@ high-volume and high-reliability applications. The name BIND stands for
|
|||
"dnscrypt-proxy-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"07piwsjczamwvdpv1585kg4awqakip51bwsm8nqi6bljww4agx7x"))
|
||||
"1dhvklr4dg2vlw108n11xbamacaryyg3dbrg629b76lp7685p7z8"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Delete bundled libltdl. XXX: This package also bundles
|
||||
|
@ -275,9 +278,9 @@ asynchronous fashion.")
|
|||
(define-public yadifa
|
||||
(package
|
||||
(name "yadifa")
|
||||
(version "2.2.3")
|
||||
(version "2.2.4")
|
||||
(source
|
||||
(let ((revision "6711"))
|
||||
(let ((revision "6924"))
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -285,7 +288,7 @@ asynchronous fashion.")
|
|||
name "-" version "-" revision ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ikfm40gx0zjw3gnxsw3rn1k4wb8jacgklja3ygcj1knq6hy2zaa")))))
|
||||
"060ydcfn9876bs6p5xi3p1k20ca547f4jck25r5x1hnxjlv7ss03")))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("which" ,which)))
|
||||
|
@ -318,14 +321,14 @@ Extensions} (DNSSEC).")
|
|||
(define-public knot
|
||||
(package
|
||||
(name "knot")
|
||||
(version "2.4.2")
|
||||
(version "2.4.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://secure.nic.cz/files/knot-dns/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0licfnjl0mq9lzdn6frzdasrj65253xc9n33dhvxcjqr3z7pznip"))
|
||||
"0kvhibnnk77nqi9gdw2zbnp0dydfcy6zy96qv0f3a7wwnay5h0pr"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -377,7 +380,7 @@ Extensions} (DNSSEC).")
|
|||
"/etc/bash_completion.d"))))
|
||||
(home-page "https://www.knot-dns.cz/")
|
||||
(synopsis "Authoritative DNS name server")
|
||||
(description "Knot DNS is an authorative name server for the @dfn{Domain
|
||||
(description "Knot DNS is an authoritative name server for the @dfn{Domain
|
||||
Name System} (DNS), designed to meet the needs of root and @dfn{top-level
|
||||
domain} (TLD) name servers. It is implemented as a threaded daemon and uses a
|
||||
number of programming techniques to improve speed. For example, the responder
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -19,7 +20,7 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages ebook)
|
||||
#:use-module ((guix licenses) #:select (gpl3 lgpl2.1+))
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu)
|
||||
|
@ -27,8 +28,10 @@
|
|||
#:use-module (guix build-system python)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages fonts)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages image)
|
||||
|
@ -38,6 +41,7 @@
|
|||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages xorg))
|
||||
|
||||
(define-public chmlib
|
||||
|
@ -56,12 +60,12 @@
|
|||
(home-page "http://www.jedrea.com/chmlib/")
|
||||
(synopsis "Library for CHM files")
|
||||
(description "CHMLIB is a library for dealing with ITSS/CHM format files.")
|
||||
(license lgpl2.1+)))
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public calibre
|
||||
(package
|
||||
(name "calibre")
|
||||
(version "2.76.0")
|
||||
(version "2.85.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -70,33 +74,35 @@
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8"))
|
||||
"1g8s0kp1gj05yysfgqpp2lgrxvzc0fsny1hwzx5jh9hvqn0b53cc"))
|
||||
;; Remove non-free or doubtful code, see
|
||||
;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(delete-file-recursively "src/calibre/ebooks/markdown")
|
||||
(delete-file-recursively "src/unrar")
|
||||
(delete-file "src/odf/thumbnail.py")))
|
||||
(delete-file "src/odf/thumbnail.py")
|
||||
(delete-file-recursively "resources/fonts/liberation")
|
||||
(delete-file-recursively "src/chardet")
|
||||
(substitute* (find-files "." "\\.py")
|
||||
(("calibre\\.ebooks\\.markdown") "markdown"))
|
||||
#t))
|
||||
(patches (search-patches "calibre-drop-unrar.patch"
|
||||
"calibre-use-packaged-feedparser.patch"
|
||||
"calibre-dont-load-remote-icons.patch"
|
||||
"calibre-no-updates-dialog.patch"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("font-liberation" ,font-liberation)
|
||||
("qtbase" ,qtbase) ; for qmake
|
||||
;; xdg-utils is supposed to be used for desktop integration, but it
|
||||
;; also creates lots of messages
|
||||
;; mkdir: cannot create directory '/homeless-shelter': Permission denied
|
||||
("python2-flake8" ,python2-flake8)
|
||||
("xdg-utils" ,xdg-utils)))
|
||||
;; FIXME: The following are missing inputs according to the documentation,
|
||||
;; but the package can apparently be used without them,
|
||||
;; They may need to be added if a deficiency is detected.
|
||||
;; BeautifulSoup >= 3.0.5
|
||||
;; dnspython >= 1.6.0
|
||||
;; poppler >= 0.20.2
|
||||
;; libwmf >= 0.2.8
|
||||
;; psutil >= 0.6.1
|
||||
;; python-pygments >= 2.0.1 ; used for ebook editing
|
||||
;; Beautifulsoup3 is bundled but obsolete and not packaged, so just leave it bundled.
|
||||
(inputs
|
||||
`(("chmlib" ,chmlib)
|
||||
("fontconfig" ,fontconfig)
|
||||
|
@ -108,16 +114,22 @@
|
|||
("libxrender" ,libxrender)
|
||||
("openssl" ,openssl)
|
||||
("podofo" ,podofo)
|
||||
("poppler" ,poppler)
|
||||
("python" ,python-2)
|
||||
("python2-apsw" ,python2-apsw)
|
||||
("python2-chardet" ,python2-chardet)
|
||||
("python2-cssselect" ,python2-cssselect)
|
||||
("python2-cssutils" ,python2-cssutils)
|
||||
("python2-dateutil" ,python2-dateutil)
|
||||
("python2-dbus" ,python2-dbus)
|
||||
("python2-dnspython" ,python2-dnspython)
|
||||
("python2-feedparser" ,python2-feedparser)
|
||||
("python2-lxml" ,python2-lxml)
|
||||
("python2-markdown" ,python2-markdown)
|
||||
("python2-mechanize" ,python2-mechanize)
|
||||
("python2-netifaces" ,python2-netifaces)
|
||||
("python2-pillow" ,python2-pillow)
|
||||
("python2-pygments" ,python2-pygments)
|
||||
("python2-pyqt" ,python2-pyqt)
|
||||
("python2-sip" ,python2-sip)
|
||||
("sqlite" ,sqlite)))
|
||||
|
@ -130,6 +142,12 @@
|
|||
#:use-setuptools? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-source
|
||||
(lambda _
|
||||
(substitute* "src/calibre/linux.py"
|
||||
;; We can't use the uninstaller in Guix. Don't build it.
|
||||
(("self\\.create_uninstaller()") ""))
|
||||
#t))
|
||||
(add-before 'build 'configure
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((podofo (assoc-ref inputs "podofo"))
|
||||
|
@ -137,7 +155,17 @@
|
|||
(substitute* "setup/build_environment.py"
|
||||
(("sys.prefix") (string-append "'" pyqt "'")))
|
||||
(setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo"))
|
||||
(setenv "PODOFO_LIB_DIR" (string-append podofo "/lib"))))))))
|
||||
(setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")))))
|
||||
(add-after 'install 'install-font-liberation
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(for-each (lambda (file)
|
||||
(install-file file (string-append
|
||||
(assoc-ref outputs "out")
|
||||
"/share/calibre/fonts/liberation")))
|
||||
(find-files (string-append
|
||||
(assoc-ref inputs "font-liberation")
|
||||
"/share/fonts/truetype")))
|
||||
#t)))))
|
||||
(home-page "http://calibre-ebook.com/")
|
||||
(synopsis "E-book library management software")
|
||||
(description "Calibre is an ebook library manager. It can view, convert
|
||||
|
@ -145,4 +173,16 @@ and catalog ebooks in most of the major ebook formats. It can also talk
|
|||
to many ebook reader devices. It can go out to the Internet and fetch
|
||||
metadata for books. It can download newspapers and convert them into
|
||||
ebooks for convenient reading.")
|
||||
(license gpl3))) ; some files are under various other licenses, see COPYRIGHT
|
||||
;; Calibre is largely GPL3+, but includes a number of components covered
|
||||
;; by other licenses. See COPYRIGHT for more details.
|
||||
(license (list license:gpl3+
|
||||
license:gpl2+
|
||||
license:lgpl2.1+
|
||||
license:lgpl2.1
|
||||
license:bsd-3
|
||||
license:expat
|
||||
license:zpl2.1
|
||||
license:asl2.0
|
||||
license:public-domain
|
||||
license:silofl1.1
|
||||
license:cc-by-sa3.0))))
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -28,6 +29,7 @@
|
|||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages kde-frameworks) ; extra-cmake-modules
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
|
@ -102,6 +104,49 @@ of categories with some of the activities available in that category.
|
|||
")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public gcompris-qt
|
||||
(package
|
||||
(name "gcompris-qt")
|
||||
(version "0.70")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://gcompris.net/download/qt/src/gcompris-qt-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01r7i8dmwb2nlfyp0y0mzs8yydmvn5gq7xn1w7g21lysak1mliwa"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
;; Qml_box2d is unmaintained and not actually required for building
|
||||
'(#:configure-flags (list "-DQML_BOX2D_MODULE=disabled")
|
||||
#:tests? #f)) ; no test target
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("gettext" ,gettext-minimal)
|
||||
("perl" ,perl)))
|
||||
(inputs
|
||||
`(("python-2" ,python-2)
|
||||
("qt" ,qt))) ; Cannot find qtquick at runtime with modular qt.
|
||||
(home-page "http://gcompris.net/index-en.html")
|
||||
(synopsis "Educational games for small children")
|
||||
(description
|
||||
"Gcompris offers a large collection of educational games for small
|
||||
children, designed to be a unified interface to integrate more educational
|
||||
games. Language-oriented games contain vocabulary, sounds, and voices for
|
||||
many different languages.
|
||||
Currently available boards include:
|
||||
@enumerate
|
||||
@item learning how to use a mouse and keyboard
|
||||
@item learning simple arithmetic
|
||||
@item learning how to read an analog clock
|
||||
@item recognize letters after hearing their names
|
||||
@item reading practice
|
||||
@item small games (memory games, jigsaw puzzles, ...)
|
||||
@end enumerate\n")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public tipp10
|
||||
(package
|
||||
(name "tipp10")
|
||||
|
|
|
@ -32,14 +32,14 @@
|
|||
(define-public elfutils
|
||||
(package
|
||||
(name "elfutils")
|
||||
(version "0.168")
|
||||
(version "0.169")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://sourceware.org/elfutils/ftp/"
|
||||
version "/elfutils-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xn2fbgda1i703csfs35frvm7l068ybmay4ssrykqdx17f4hg3dq"))
|
||||
"1hiv1yqig3292dwqhrwsxwk3qjalxp5fpl8yphwbfwh8ng3zl4ll"))
|
||||
(patches (search-patches "elfutils-tests-ptrace.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016 Pjotr Prins <pjotr.public12@thebird.nl>
|
||||
;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl>
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -30,7 +30,7 @@
|
|||
(define-public elixir
|
||||
(package
|
||||
(name "elixir")
|
||||
(version "1.3.2")
|
||||
(version "1.4.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/elixir-lang/elixir"
|
||||
|
@ -38,9 +38,10 @@
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jsc6kl7f74yszcypdv3w3vhyc9qfqav8nwc41in082m0vpfy95y"))
|
||||
;; FIXME: Some tests had to be disabled as they fail in the
|
||||
;; build environment. Common failures are:
|
||||
"0gsmgx4h6rvxilcbsx2z6yirm6g2g5bsxdvr0608ng4bsv22wknb"))
|
||||
;; FIXME: 27 tests (out of 4K) had to be disabled as
|
||||
;; they fail in the build environment. Common failures
|
||||
;; are:
|
||||
;; - Mix.Shell.cmd() fails with error 130
|
||||
;; - The git_repo fixture cannot be found
|
||||
;; - Communication with spawned processes fails with EPIPE
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -773,3 +773,27 @@ simulator.")
|
|||
the Raspberry Pi chip.")
|
||||
(license license:gpl3+)
|
||||
(home-page "https://github.com/puppeh/vc4-toolchain/"))))
|
||||
|
||||
(define-public gcc-vc4
|
||||
(let ((commit "165f6d0e11d2e76ee799533bb45bd5c92bf60dc2")
|
||||
(xgcc (cross-gcc "vc4-elf" binutils-vc4)))
|
||||
(package (inherit xgcc)
|
||||
(name "gcc-vc4")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/puppeh/gcc-vc4.git")
|
||||
(commit commit)))
|
||||
(file-name (string-append name
|
||||
"-"
|
||||
(package-version xgcc)
|
||||
"-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"13h30qjcwnlz6lfma1d82nnvfmjnhh7abkagip4vly6vm5fpnvf2"))))
|
||||
(native-inputs
|
||||
`(("flex" ,flex)
|
||||
,@(package-native-inputs xgcc)))
|
||||
(synopsis "GCC for VC4")
|
||||
(description "This package provides @code{gcc} for VideoCore IV,
|
||||
the Raspberry Pi chip."))))
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 David Thompson <davet@gnu.org>
|
||||
|
@ -53,6 +53,7 @@
|
|||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages imagemagick)
|
||||
#:use-module (gnu packages linux) ;FIXME: for pcb
|
||||
#:use-module (gnu packages m4)
|
||||
#:use-module (gnu packages maths)
|
||||
|
@ -107,7 +108,8 @@
|
|||
`(("boost" ,boost)
|
||||
("muparser" ,muparser)
|
||||
("freetype" ,freetype)
|
||||
("qt" ,qt)))
|
||||
("qtbase" ,qtbase)
|
||||
("qtsvg" ,qtsvg)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("which" ,which)))
|
||||
|
@ -173,15 +175,14 @@ utilities.")
|
|||
(define-public pcb
|
||||
(package
|
||||
(name "pcb")
|
||||
(version "20140316")
|
||||
(version "4.0.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://ftp.geda-project.org/pcb/pcb-" version "/pcb-"
|
||||
version ".tar.gz"))
|
||||
(uri (string-append "mirror://sourceforge/pcb/pcb/pcb-" version
|
||||
"/pcb-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42"))))
|
||||
"1i6sk8g8h9avms142wl07yv20m1cm4c3fq3v6hybrhdxs2n17plf"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -200,7 +201,13 @@ utilities.")
|
|||
(path (string-append (assoc-ref inputs "udev") "/lib")))
|
||||
(wrap-program (string-append out "/bin/pcb")
|
||||
`("LD_LIBRARY_PATH" ":" prefix (,path)))))
|
||||
%standard-phases))))
|
||||
(alist-cons-before
|
||||
'check 'pre-check
|
||||
(lambda _
|
||||
(system "Xvfb :1 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
#t)
|
||||
%standard-phases)))))
|
||||
(inputs
|
||||
`(("dbus" ,dbus)
|
||||
("mesa" ,mesa)
|
||||
|
@ -216,7 +223,12 @@ utilities.")
|
|||
`(("pkg-config" ,pkg-config)
|
||||
("intltool" ,intltool)
|
||||
("bison" ,bison)
|
||||
("flex" ,flex)))
|
||||
("flex" ,flex)
|
||||
;; For tests
|
||||
("imagemagick" ,imagemagick)
|
||||
("gerbv" ,gerbv)
|
||||
("ghostscript" ,ghostscript)
|
||||
("xvfb" ,xorg-server)))
|
||||
(home-page "http://pcb.geda-project.org/")
|
||||
(synopsis "Design printed circuit board layouts")
|
||||
(description
|
||||
|
@ -774,3 +786,29 @@ render model libraries.")
|
|||
educational use. As such, there is an emphasis on capabilities that improve
|
||||
the 'showing the effect of'-style of operation.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public volk
|
||||
(package
|
||||
(name "volk")
|
||||
(version "1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://libvolk.org/releases/volk-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bz3ywc6y5wmz3i8p4z2wbzhns8bc0ywdkl9qnxpcvfcscarbdlh"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("boost" ,boost)))
|
||||
(native-inputs
|
||||
`(("python-2", python-2)
|
||||
("python2-cheetah" ,python2-cheetah)))
|
||||
(home-page "http://libvolk.org/")
|
||||
(synopsis "Vector-Optimized Library of Kernels")
|
||||
(description
|
||||
"@code{volk} contains procedures with machine-specific optimizations
|
||||
for mathematical functions. It also provides an machine-independent
|
||||
interface to select the best such procedures to use on a given system.")
|
||||
(license license:gpl3+)))
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
(define-public efl
|
||||
(package
|
||||
(name "efl")
|
||||
(version "1.18.4")
|
||||
(version "1.18.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -65,7 +65,7 @@
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"09c0ajszjarcs6d62zlgnf1aha2f921mfr0gxg6nwza36xzc1srr"))))
|
||||
"0wxz00cijynamm0sx4ss4hp89zyz5y6zliv5zd905jn4nak2mw2n"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -133,7 +133,7 @@
|
|||
"--with-opengl=es"
|
||||
"--enable-egl"
|
||||
"--enable-harfbuzz")))
|
||||
(home-page "https://www.enlightenment.org")
|
||||
(home-page "https://www.enlightenment.org/about-efl")
|
||||
(synopsis "Enlightenment Foundation Libraries")
|
||||
(description
|
||||
"Enlightenment Foundation Libraries is a set of libraries developed
|
||||
|
@ -197,7 +197,7 @@ Libraries with some extra bells and whistles.")
|
|||
(define-public enlightenment
|
||||
(package
|
||||
(name "enlightenment")
|
||||
(version "0.21.6")
|
||||
(version "0.21.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -205,7 +205,7 @@ Libraries with some extra bells and whistles.")
|
|||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gan3c8jbvhcmvb2fpbprr3m6db0afg1dnrb87nbqb399nsi81zd"))))
|
||||
"1xvngjdsa0p901vfhrh2qpa50k32hwwhc8bgi16a9b5d9byzfhvn"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--enable-mount-eeze")))
|
||||
|
@ -221,7 +221,7 @@ Libraries with some extra bells and whistles.")
|
|||
("libxext" ,libxext)
|
||||
("linux-pam" ,linux-pam)
|
||||
("xcb-util-keysyms" ,xcb-util-keysyms)))
|
||||
(home-page "https://www.enlightenment.org")
|
||||
(home-page "https://www.enlightenment.org/about-enlightenment")
|
||||
(synopsis "Lightweight desktop environment")
|
||||
(description
|
||||
"Enlightenment is resource friendly desktop environment with integrated
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 Steve Sprang <scs@stevesprang.com>
|
||||
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016 Pjotr Prins <pjotr.public12@thebird.nl>
|
||||
;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -34,8 +34,7 @@
|
|||
(define-public erlang
|
||||
(package
|
||||
(name "erlang")
|
||||
;; When updating, remember to update the hash of erlang-manpages!
|
||||
(version "19.0")
|
||||
(version "19.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
;; The tarball from http://erlang.org/download contains many
|
||||
|
@ -46,7 +45,7 @@
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dxyz6x1yfv33fd0xfry2ihylkyfa2d655q1vxvbz8dflyd64yqh"))))
|
||||
"1b47jh549yywyp8fbs8a8j4ydr3zn982navzyqvlms6rg8vwb0pw"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
|
@ -61,7 +60,7 @@
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07j0l7ary936hil38xr3hvfw6j74pshkyyi98kc9cassbbcdd8y7"))))))
|
||||
"0p6r3n3y7lbhv38sw8f2vi1xlmc137gyspk9ap086w1nszyjy6gq"))))))
|
||||
(inputs
|
||||
`(("ncurses" ,ncurses)
|
||||
("openssl" ,openssl)
|
||||
|
@ -162,9 +161,8 @@
|
|||
(zero? (system* "tar" "xvf" manpages))
|
||||
(rename-file "COPYRIGHT"
|
||||
(string-append share "/misc/erlang/COPYRIGHT"))
|
||||
;; Delete superfluous files.
|
||||
(for-each delete-file '("PR.template"
|
||||
"README"))))))))))
|
||||
;; Delete superfluous file.
|
||||
(delete-file "PR.template")))))))))
|
||||
(home-page "http://erlang.org/")
|
||||
(synopsis "The Erlang programming language")
|
||||
(description
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
(define-public bitcoin-core
|
||||
(package
|
||||
(name "bitcoin-core")
|
||||
(version "0.14.0")
|
||||
(version "0.14.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -57,7 +57,7 @@
|
|||
version "/bitcoin-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07k4i9r033dsvkp5ii5g3hykidm8b19c8c0mz1bi8k0dda3d8hyp"))))
|
||||
"18zrsinlwkj4q5bj2hzswbhswkvd0sdfi6skfwqwwk85gzh064pj"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
|
||||
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016, 2017 ng0 <ng0@libertad.pw>
|
||||
;;; Copyright © 2016 Jookia <166291@gmail.com>
|
||||
|
@ -17,6 +17,8 @@
|
|||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.com>
|
||||
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -239,8 +241,11 @@ provide serif, sans and monospaced variants.")
|
|||
(description "Vera is a sans-serif typeface from Bitstream, Inc. This
|
||||
package provides the TrueType (TTF) files.")
|
||||
(license
|
||||
(license:x11-style
|
||||
"http://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts"))))
|
||||
(license:fsdg-compatible
|
||||
"https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts"
|
||||
"The Font Software may be sold as part of a larger software package but
|
||||
no copy of one or more of the Font Software typefaces may be sold by
|
||||
itself."))))
|
||||
|
||||
(define-public font-cantarell
|
||||
(package
|
||||
|
@ -316,7 +321,7 @@ sans-serif designed for on-screen reading. It is used by GNOME@tie{}3.")
|
|||
(version "2.00.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://fedorahosted.org/releases/l/i/"
|
||||
(uri (string-append "https://releases.pagure.org/"
|
||||
"liberation-fonts/liberation-fonts-ttf-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
|
@ -350,7 +355,7 @@ sans-serif designed for on-screen reading. It is used by GNOME@tie{}3.")
|
|||
`(("source" ,source)
|
||||
("tar" ,tar)
|
||||
("gzip" ,gzip)))
|
||||
(home-page "https://fedorahosted.org/liberation-fonts/")
|
||||
(home-page "https://pagure.io/liberation-fonts/")
|
||||
(synopsis
|
||||
"Fonts compatible with Arial, Times New Roman, and Courier New")
|
||||
(description
|
||||
|
@ -370,6 +375,63 @@ and Bitstream Vera Sans Mono).
|
|||
The Liberation Fonts are sponsored by Red Hat.")
|
||||
(license license:silofl1.1)))
|
||||
|
||||
(define-public font-linuxlibertine
|
||||
(package
|
||||
(name "font-linuxlibertine")
|
||||
(version "5.3.0")
|
||||
(source (origin
|
||||
(method url-fetch/tarbomb)
|
||||
(uri (string-append "mirror://sourceforge/linuxlibertine/"
|
||||
"linuxlibertine/" version
|
||||
"/LinLibertineSRC_" version "_2012_07_02.tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; there are no tests
|
||||
#:modules ((guix build utils)
|
||||
(guix build gnu-build-system)
|
||||
(srfi srfi-1)
|
||||
(srfi srfi-26))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(let ((compile
|
||||
(lambda (name ext)
|
||||
(zero? (system*
|
||||
"fontforge" "-lang=ff"
|
||||
"-c" (string-append "Open('" name "');"
|
||||
"Generate('"
|
||||
(basename name "sfd") ext
|
||||
"')"))))))
|
||||
(every (lambda (name)
|
||||
(and (compile name "ttf")
|
||||
(compile name "otf")))
|
||||
(find-files "." "\\.sfd$")))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((font-dir (string-append (assoc-ref outputs "out")
|
||||
"/share/fonts/truetype")))
|
||||
(mkdir-p font-dir)
|
||||
(for-each (cut install-file <> font-dir)
|
||||
(find-files "." "\\.(otf|ttf)$"))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("fontforge" ,fontforge)))
|
||||
(home-page "http://www.linuxlibertine.org/")
|
||||
(synopsis "Serif and sans serif typefaces")
|
||||
(description "The Linux Libertine fonts is a set of typefaces containing
|
||||
both a Serif version (\"Linux Libertine\") and a Sans Serif (\"Linux
|
||||
Biolinum\") designed to be used together as an alternative for Times/Times New
|
||||
Roman and Helvetica/Arial. The Serif typeface comes in two shapes and two
|
||||
weights, and with a Small Capitals version of the regular typeface. Linux
|
||||
Biolinum is available in both Regular and Bold weights.")
|
||||
;; The fonts are released under either of these licenses.
|
||||
(license (list license:gpl2+ license:silofl1.1))))
|
||||
|
||||
(define-public font-terminus
|
||||
(package
|
||||
(name "font-terminus")
|
||||
|
@ -461,6 +523,104 @@ fonts are intended to support the characters necessary to render or display
|
|||
text in Simplified Chinese, Traditional Chinese, Japanese, and Korean.")
|
||||
(license license:silofl1.1)))
|
||||
|
||||
(define-public font-cns11643
|
||||
(package
|
||||
(name "font-cns11643")
|
||||
(version "98.1.20170405")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri "http://www.cns11643.gov.tw/AIDB/Open_Data.zip")
|
||||
(sha256
|
||||
(base32
|
||||
"02kb3bwjrra0k2hlr2p8xswd2y0xs6j8d9vm6yrby734h02a40qf"))))
|
||||
(outputs '("out" "tw-kai" "tw-sung"))
|
||||
(build-system trivial-build-system)
|
||||
(native-inputs
|
||||
`(("unzip" ,unzip)))
|
||||
(arguments
|
||||
`(#:modules ((guix build utils))
|
||||
#:builder
|
||||
(begin
|
||||
(use-modules (guix build utils))
|
||||
(let* ((font-dir "/share/fonts/truetype/cns11643")
|
||||
(out (string-append
|
||||
(assoc-ref %outputs "out") font-dir))
|
||||
(tw-kai (string-append
|
||||
(assoc-ref %outputs "tw-kai") font-dir))
|
||||
(tw-sung (string-append
|
||||
(assoc-ref %outputs "tw-sung") font-dir))
|
||||
(unzip (string-append
|
||||
(assoc-ref %build-inputs "unzip") "/bin/unzip")))
|
||||
(system* unzip (assoc-ref %build-inputs "source"))
|
||||
(chdir "Open_Data/Fonts/")
|
||||
(install-file "TW-Kai-98_1.ttf" tw-kai)
|
||||
(install-file "TW-Sung-98_1.ttf" tw-sung)
|
||||
(install-file "TW-Kai-98_1.ttf" out)
|
||||
(install-file "TW-Kai-Ext-B-98_1.ttf" out)
|
||||
(install-file "TW-Kai-Plus-98_1.ttf" out)
|
||||
(install-file "TW-Sung-98_1.ttf" out)
|
||||
(install-file "TW-Sung-Ext-B-98_1.ttf" out)
|
||||
(install-file "TW-Sung-Plus-98_1.ttf" out)
|
||||
#t))))
|
||||
(home-page "http://www.cns11643.gov.tw/AIDB/welcome.do")
|
||||
(synopsis "CJK TrueType fonts, TW-Kai and TW-Sung")
|
||||
(description
|
||||
"@code{CNS 11643} character set (Chinese National Standard, or Chinese
|
||||
Standard Interchange Code) is the standard character set of the Republic of
|
||||
China (Taiwan) for Chinese Characters and other Unicode symbols. Contained
|
||||
are six TrueType fonts based on two script styles, Regular script (Kai), and
|
||||
Sung/Ming script, each with three variants:
|
||||
|
||||
@itemize
|
||||
@item @code{CNS 11643} (@code{TW-Kai} and @code{TW-Sung}): Tens of thousands
|
||||
of CJK characters from frequency tables published by the Taiwanese
|
||||
Ministry of Education. ISO 10646 and Unicode compatible encoding.
|
||||
@item @code{Big-5 Plus}: Several thousand frequently used CJK characters
|
||||
encoded in the user defined area of the Big-5 code.
|
||||
@item @code{Big-5 Extended}: A Big-5 character set based on the
|
||||
@code{Big-5 Plus} and @code{CNS 11643} character sets.
|
||||
@end itemize\n")
|
||||
(license (license:non-copyleft
|
||||
"http://data.gov.tw/license")))) ; CC-BY 4.0 compatible
|
||||
|
||||
(define-public font-cns11643-swjz
|
||||
(package
|
||||
(name "font-cns11643-swjz")
|
||||
(version "1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri "https://www.moedict.tw/fonts/truetype/cns11643/ebas927.ttf")
|
||||
(sha256
|
||||
(base32
|
||||
"1qkljldbmb53zp1rcmpsb8rzy67rnsqcjxi549m9743ifk4isl78"))))
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build utils))
|
||||
#:builder
|
||||
(begin
|
||||
(use-modules (guix build utils))
|
||||
(let ((font-dir (string-append %output
|
||||
"/share/fonts/truetype/cns11643"))
|
||||
(source (assoc-ref %build-inputs "source")))
|
||||
(mkdir-p font-dir)
|
||||
(copy-file source
|
||||
(string-append font-dir "/" "ebas927.ttf"))
|
||||
#t))))
|
||||
(home-page
|
||||
(string-append "http://www.cns11643.gov.tw/AIDB/download.do"
|
||||
"?name=%E5%AD%97%E5%9E%8B%E4%B8%8B%E8%BC%89"))
|
||||
(synopsis "TrueType seal script font")
|
||||
(description
|
||||
"@code{Shuowen Jiezi} is a TrueType seal script font based on the ancient
|
||||
text of the same name published by the Executive Yuan of Taiwan. 6721 glyphs
|
||||
are included, at Unicode compatible code points corresponding to their modern
|
||||
variants.")
|
||||
;; Original text only available in Chinese. More info at
|
||||
;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26703#11
|
||||
(license (license:non-copyleft
|
||||
"http://www.cns11643.gov.tw/AIDB/copyright.do"))))
|
||||
|
||||
(define-public font-wqy-zenhei
|
||||
(package
|
||||
(name "font-wqy-zenhei")
|
||||
|
|
|
@ -381,7 +381,12 @@ applications should be.")
|
|||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/silnrsi/graphite/releases/"
|
||||
"download/" version "/" name "-" version ".tgz"))
|
||||
(patches (search-patches "graphite2-ffloat-store.patch"))
|
||||
(patches (search-patches
|
||||
"graphite2-ffloat-store.patch"
|
||||
"graphite2-check-code-point-limit.patch"
|
||||
"graphite2-CVE-2017-5436.patch"
|
||||
"graphite2-fix-32-bit-wrap-arounds.patch"
|
||||
"graphite2-non-linear-classes-even-number.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0rs5h7m340z75kygx8d72cps0q6yvvqa9i788vym7585cfv8a0gc"))))
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
|
||||
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -55,6 +56,7 @@
|
|||
#:use-module (gnu packages polkit)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages w3m)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xorg))
|
||||
|
@ -62,23 +64,61 @@
|
|||
(define-public xdg-utils
|
||||
(package
|
||||
(name "xdg-utils")
|
||||
(version "1.0.2")
|
||||
(version "1.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://portland.freedesktop.org/download/xdg-utils-"
|
||||
version ".tgz"))
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1b019d3r1379b60p33d6z44kx589xjgga62ijz9vha95dg8vgbi1"))))
|
||||
"09a1pk3ifsndc5qz2kcd1557i137gpgnv3d739pv22vfayi67pdh"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("docbook-xsl" ,docbook-xsl)
|
||||
("docbook-xml" ,docbook-xml-4.1.2)
|
||||
("libxslt" ,libxslt)
|
||||
("w3m" ,w3m)
|
||||
("xmlto" ,xmlto)))
|
||||
(propagated-inputs
|
||||
`(("xprop" ,xprop) ; for Xfce detecting
|
||||
("xset" ,xset))) ; for xdg-screensaver
|
||||
(arguments
|
||||
`(#:tests? #f)) ; no check target
|
||||
(home-page "http://portland.freedesktop.org/")
|
||||
`(#:tests? #f ; no check target
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-hardcoded-paths
|
||||
(lambda _
|
||||
(substitute* "scripts/xdg-mime.in"
|
||||
(("/usr/bin/file") (which "file")))
|
||||
(substitute* "scripts/xdg-open.in"
|
||||
(("/usr/bin/printf") (which "printf")))
|
||||
#t))
|
||||
(add-before 'build 'locate-catalog-files
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
|
||||
"/xml/dtd/docbook"))
|
||||
(xsldoc (string-append (assoc-ref inputs "docbook-xsl")
|
||||
"/xml/xsl/docbook-xsl-"
|
||||
,(package-version docbook-xsl))))
|
||||
(for-each (lambda (file)
|
||||
(substitute* file
|
||||
(("http://.*/docbookx\\.dtd")
|
||||
(string-append xmldoc "/docbookx.dtd"))))
|
||||
(find-files "scripts/desc" "\\.xml$"))
|
||||
(substitute* "scripts/Makefile"
|
||||
;; Apparently `xmlto' does not bother to looks up the stylesheets
|
||||
;; specified in the XML, unlike the above substitition. Instead it
|
||||
;; uses a hard-coded URL. Work around it here, but if this is
|
||||
;; common perhaps we should hardcode this path in xmlto itself.
|
||||
(("\\$\\(XMLTO\\) man")
|
||||
(string-append "$(XMLTO) -x " xsldoc
|
||||
"/manpages/docbook.xsl man")))
|
||||
(setenv "STYLESHEET"
|
||||
(string-append xsldoc "/html/docbook.xsl"))
|
||||
#t))))))
|
||||
(home-page "https://www.freedesktop.org/wiki/Software/xdg-utils/")
|
||||
(synopsis "Freedesktop.org scripts for desktop integration")
|
||||
(description "The xdg-utils package is a set of simple scripts that
|
||||
provide basic desktop integration functions in the framework of the
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Julian Graham <joolean@gmail.com>
|
||||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -69,7 +70,7 @@
|
|||
(define-public bullet
|
||||
(package
|
||||
(name "bullet")
|
||||
(version "2.85.1")
|
||||
(version "2.86.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/bulletphysics/bullet3/"
|
||||
|
@ -77,7 +78,7 @@
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qpd37ws0xlxwy55dg058a5b4yw2jxiz09yyc3lc0frpa05pq5bf"))))
|
||||
"0nghzcl84p8di215p7xj0gy1hyy072hw2xk9cnmav9hv6bjb4n60"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags (list (string-append
|
||||
|
@ -186,6 +187,68 @@ and network communications. A very thin client library can be embedded to
|
|||
provide connectivity for client applications written in any language.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public python-sge-pygame
|
||||
(package
|
||||
(name "python-sge-pygame")
|
||||
(version "1.4.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "sge-pygame" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1qhrcja1igqkjjn1w425ni5f41mijdq5dpq0ymkhl29xxrf8hnx8"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-pygame" ,python-pygame)
|
||||
("python-six" ,python-six)))
|
||||
(home-page "http://stellarengine.nongnu.org")
|
||||
(synopsis "2D game engine for Python")
|
||||
(description
|
||||
"The SGE Game Engine (\"SGE\", pronounced like \"Sage\") is a
|
||||
general-purpose 2D game engine. It takes care of several details fro you so
|
||||
you can focus on the game itself. This makes more rapid game development
|
||||
possible, and it also makes the SGE easy to learn.")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public python2-sge-pygame
|
||||
(package-with-python2 python-sge-pygame))
|
||||
|
||||
(define-public python-tmx
|
||||
(package
|
||||
(name "python-tmx")
|
||||
(version "1.9.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/python-tmx/tmx-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1is107sx3lr09dqjiyn10xqhyv5x54c2ryhys9mb9j3mxjbm227l"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-six" ,python-six)))
|
||||
(home-page "http://python-tmx.nongnu.org")
|
||||
(synopsis "Python library for the @code{Tiled} TMX format")
|
||||
(description
|
||||
"Python TMX reads and writes the @code{Tiled} TMX format in a simple way.
|
||||
This is useful for map editors or generic level editors, and it's also useful
|
||||
for using a map editor or generic level editor like Tiled to edit your game's
|
||||
levels.")
|
||||
(license (list license:asl2.0
|
||||
;; Documentation (only available in the source tarball) is
|
||||
;; under the CC0 license.
|
||||
license:cc0))))
|
||||
|
||||
(define-public python2-tmx
|
||||
(let ((python2-tmx (package-with-python2 python-tmx)))
|
||||
(package
|
||||
(inherit python2-tmx)
|
||||
(propagated-inputs
|
||||
`(("python2-pathlib" ,python2-pathlib)
|
||||
,@(package-propagated-inputs python2-tmx))))))
|
||||
|
||||
(define-public tiled
|
||||
(package
|
||||
(name "tiled")
|
||||
|
@ -253,7 +316,7 @@ clone.")
|
|||
("libjpeg" ,libjpeg)
|
||||
("libsndfile" ,libsndfile)
|
||||
("openal" ,openal)))
|
||||
(home-page "http://www.sfml-dev.org")
|
||||
(home-page "https://www.sfml-dev.org")
|
||||
(synopsis "Simple and Fast Multimedia Library")
|
||||
(description
|
||||
"SFML provides a simple interface to the various computer components,
|
||||
|
@ -305,7 +368,7 @@ sounds from presets such as \"explosion\" or \"powerup\".")
|
|||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://icculus.org/physfs/downloads/physfs-"
|
||||
"https://icculus.org/physfs/downloads/physfs-"
|
||||
version ".tar.bz2"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
|
@ -318,7 +381,7 @@ sounds from presets such as \"explosion\" or \"powerup\".")
|
|||
`(("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("doxygen" ,doxygen)))
|
||||
(home-page "http://icculus.org/physfs")
|
||||
(home-page "https://icculus.org/physfs")
|
||||
(synopsis "File system abstraction library")
|
||||
(description
|
||||
"PhysicsFS is a library to provide abstract access to various archives.
|
||||
|
@ -510,7 +573,7 @@ etc.")
|
|||
(description "Aseprite is a tool for creating 2D pixel art for video
|
||||
games. In addition to basic pixel editing features, Aseprite can assist in
|
||||
the creation of animations, tiled graphics, texture atlases, and more.")
|
||||
(home-page "http://www.aseprite.org/")
|
||||
(home-page "https://www.aseprite.org/")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public qqwing
|
||||
|
@ -655,7 +718,7 @@ interface (API).")
|
|||
("libsmpeg" ,libsmpeg)
|
||||
("portmidi" ,portmidi)
|
||||
("v4l-utils" ,v4l-utils)))
|
||||
(home-page "http://www.pygame.org")
|
||||
(home-page "https://www.pygame.org")
|
||||
(synopsis "SDL wrapper for Python")
|
||||
(description "Pygame is a set of Python modules designed for writing games.
|
||||
Pygame adds functionality on top of the excellent SDL library. This allows you
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014, 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2014, 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
|
||||
|
@ -399,6 +399,19 @@ Go. It also includes runtime support libraries for these languages.")
|
|||
"17xjz30jb65hcf714vn9gcxvrrji8j20xm7n33qg1ywhyzryfsph"))
|
||||
(patches (search-patches "gcc-strmov-store-file-names.patch"
|
||||
"gcc-5.0-libvtv-runpath.patch"))))))
|
||||
(define-public gcc-7
|
||||
(package
|
||||
(inherit gcc-6)
|
||||
(version "7.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gcc/gcc-"
|
||||
version "/gcc-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"05xwps0ci7wgxh50askpa2r9p8518qxdgh6ad7pnyk7n6p13d0ca"))
|
||||
(patches (search-patches "gcc-strmov-store-file-names.patch"
|
||||
"gcc-5.0-libvtv-runpath.patch"))))))
|
||||
|
||||
;; Note: When changing the default gcc version, update
|
||||
;; the gcc-toolchain-* definitions and the gfortran definition
|
||||
|
@ -523,6 +536,14 @@ as the 'native-search-paths' field."
|
|||
(custom-gcc gcc-5 "gfortran" '("fortran")
|
||||
%generic-search-paths))
|
||||
|
||||
(define-public gfortran-6
|
||||
(custom-gcc gcc-6 "gfortran" '("fortran")
|
||||
%generic-search-paths))
|
||||
|
||||
(define-public gfortran-7
|
||||
(custom-gcc gcc-7 "gfortran" '("fortran")
|
||||
%generic-search-paths))
|
||||
|
||||
(define-public gfortran
|
||||
;; Note: Update this when GCC changes! We cannot use
|
||||
;; (custom-gcc gcc "fortran" …) because that would lead to a package object
|
||||
|
@ -538,140 +559,6 @@ as the 'native-search-paths' field."
|
|||
;; a cyclic dependency. <http://debbugs.gnu.org/18101>
|
||||
#:separate-lib-output? #f))
|
||||
|
||||
(define javac.in
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://sources.gentoo.org/cgi-bin/viewvc.cgi/"
|
||||
"gentoo-x86/dev-java/gcj-jdk/files/javac.in?revision=1.1"))
|
||||
(file-name "javac.in")
|
||||
(sha256 (base32
|
||||
"1c3dk4z5yfj6ic2fn3lyxs27n6pmn2wy9k0r1s17lnkf1bzkrciv"))))
|
||||
|
||||
(define-public gcj
|
||||
(package (inherit gcc)
|
||||
(name "gcj")
|
||||
(version (package-version gcc))
|
||||
(inputs
|
||||
`(("fastjar" ,fastjar)
|
||||
("perl" ,perl)
|
||||
("javac.in" ,javac.in)
|
||||
("ecj-bootstrap" ,ecj-bootstrap)
|
||||
,@(package-inputs gcc)))
|
||||
(native-inputs
|
||||
`(("dejagnu" ,dejagnu)
|
||||
,@(if (string-prefix? "armhf" (or (%current-system)
|
||||
(%current-target-system)))
|
||||
`(("arm-patch" ,(origin
|
||||
(method url-fetch)
|
||||
(uri (search-patch "gcj-arm-mode.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1z15xs5yx6qinnb572swzxrn9f668sw7ga5280q3gznj1jyrynfn")))))
|
||||
'())
|
||||
,@(package-native-inputs gcc)))
|
||||
(native-search-paths %generic-search-paths)
|
||||
|
||||
;; Suppress the separate "lib" output, because otherwise the
|
||||
;; "lib" and "out" outputs would refer to each other, creating
|
||||
;; a cyclic dependency. <http://debbugs.gnu.org/18101>
|
||||
(outputs
|
||||
(delete "lib" (package-outputs gcc)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments `(#:modules ((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(ice-9 regex)
|
||||
(srfi srfi-1)
|
||||
(srfi srfi-26))
|
||||
#:test-target "check-target-libjava"
|
||||
,@(package-arguments gcc))
|
||||
((#:tests? _) #t)
|
||||
((#:configure-flags flags)
|
||||
`(let ((ecj (assoc-ref %build-inputs "ecj-bootstrap")))
|
||||
`("--enable-java-home"
|
||||
"--enable-gjdoc"
|
||||
,(string-append "--with-ecj-jar=" ecj)
|
||||
"--enable-languages=java"
|
||||
,@(remove (cut string-match "--enable-languages.*" <>)
|
||||
,flags))))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
;; Conditionally add phase to apply patch
|
||||
,@(if (string-prefix? "armhf" (or (%current-system)
|
||||
(%current-target-system)))
|
||||
`((add-after 'unpack 'apply-arm-patch
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(zero? (system* "patch" "-p1"
|
||||
"-i" (assoc-ref inputs "arm-patch"))))))
|
||||
'())
|
||||
(add-after
|
||||
'unpack 'add-lib-output-to-rpath
|
||||
(lambda _
|
||||
(substitute* "libjava/Makefile.in"
|
||||
(("libgcj_bc_dummy_LINK = .* -shared" line)
|
||||
(string-append line " -Wl,-rpath=$(libdir)"))
|
||||
(("libgcj(_bc)?_la_LDFLAGS =" ldflags _)
|
||||
(string-append ldflags " -Wl,-rpath=$(libdir)")))))
|
||||
(add-after
|
||||
'unpack 'patch-testsuite
|
||||
;; dejagnu-1.6 removes the 'absolute' command
|
||||
(lambda _
|
||||
;; This test fails on armhf. It seems harmless enough to disable it.
|
||||
(for-each delete-file '("libjava/testsuite/libjava.lang/Throw_2.java"
|
||||
"libjava/testsuite/libjava.lang/Throw_2.out"
|
||||
"libjava/testsuite/libjava.lang/Throw_2.jar"))
|
||||
(substitute* "libjava/testsuite/lib/libjava.exp"
|
||||
(("absolute") "file normalize"))
|
||||
#t))
|
||||
(add-after
|
||||
'install 'install-javac-and-javap-wrappers
|
||||
(lambda _
|
||||
(let* ((javac (assoc-ref %build-inputs "javac.in"))
|
||||
(ecj (assoc-ref %build-inputs "ecj-bootstrap"))
|
||||
(gcj (assoc-ref %outputs "out"))
|
||||
(gcjbin (string-append gcj "/bin/"))
|
||||
(jvm (string-append gcj "/lib/jvm/"))
|
||||
(target (string-append jvm "/bin/javac")))
|
||||
|
||||
(symlink (string-append gcjbin "jcf-dump")
|
||||
(string-append jvm "/bin/javap"))
|
||||
|
||||
(copy-file ecj (string-append gcj "/share/java/ecj.jar"))
|
||||
|
||||
;; Create javac wrapper from the template javac.in by
|
||||
;; replacing the @VARIABLES@ with paths.
|
||||
(copy-file javac target)
|
||||
(patch-shebang target)
|
||||
(substitute* target
|
||||
(("@JAVA@")
|
||||
(string-append jvm "/bin/java"))
|
||||
(("@ECJ_JAR@")
|
||||
(string-append gcj "/share/java/ecj.jar"))
|
||||
(("@RT_JAR@")
|
||||
(string-append jvm "/jre/lib/rt.jar"))
|
||||
(("@TOOLS_JAR@")
|
||||
(string-append jvm "/lib/tools.jar")))
|
||||
(chmod target #o755)
|
||||
#t)))
|
||||
(add-after
|
||||
'install 'remove-broken-or-conflicting-files
|
||||
(lambda _
|
||||
(let ((out (assoc-ref %outputs "out")))
|
||||
(for-each
|
||||
delete-file
|
||||
(append (find-files (string-append out "/lib/jvm/jre/lib")
|
||||
"libjawt.so")
|
||||
(find-files (string-append out "/bin")
|
||||
".*(c\\+\\+|cpp|g\\+\\+|gcc.*)"))))
|
||||
#t))))))))
|
||||
|
||||
(define ecj-bootstrap
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri "ftp://sourceware.org/pub/java/ecj-4.9.jar")
|
||||
(sha256
|
||||
(base32
|
||||
"1k9lgm3qamf6zy534pa2zwskr8mpiqrngbv1vw9j4y1ghrdyf1lm"))))
|
||||
|
||||
(define-public gcc-objc-4.8
|
||||
(custom-gcc gcc-4.8 "gcc-objc" '("objc")
|
||||
(list (search-path-specification
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module ((guix licenses) #:select (non-copyleft)))
|
||||
#:use-module ((guix licenses) #:select (non-copyleft perl-license)))
|
||||
|
||||
(define-public gd
|
||||
(package
|
||||
|
@ -139,7 +139,7 @@ most common applications of GD involve website development.")
|
|||
(description "GD.pm is an autoloadable interface module for libgd, a
|
||||
popular library for creating and manipulating PNG files. With this library
|
||||
you can create PNG images on the fly or modify existing files.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-gd-securityimage
|
||||
(package
|
||||
|
@ -166,4 +166,4 @@ security (captcha) images. The final output is the actual graphic data, the
|
|||
mime type of the graphic, and the created random string. The module also has
|
||||
some \"styles\" that are used to create the background (or foreground) of the
|
||||
image.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2013, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
|
||||
|
@ -131,6 +131,7 @@ printing, and psresize, for adjusting page sizes.")
|
|||
(package
|
||||
(name "ghostscript")
|
||||
(version "9.14.0")
|
||||
;; XXX Try removing the bundled copy of jbig2dec.
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/ghostscript/gnu-ghostscript-"
|
||||
|
@ -144,6 +145,7 @@ printing, and psresize, for adjusting page sizes.")
|
|||
"ghostscript-CVE-2016-7978.patch"
|
||||
"ghostscript-CVE-2016-7979.patch"
|
||||
"ghostscript-CVE-2016-8602.patch"
|
||||
"ghostscript-CVE-2017-8291.patch"
|
||||
"ghostscript-runpath.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
|
@ -208,7 +210,7 @@ output file formats and printers.")
|
|||
(properties '((upstream-name . "gnu-ghostscript")))))
|
||||
|
||||
(define-public ghostscript/x
|
||||
(package (inherit ghostscript)
|
||||
(package/inherit ghostscript
|
||||
(name (string-append (package-name ghostscript) "-with-x"))
|
||||
(inputs `(("libxext" ,libxext)
|
||||
("libxt" ,libxt)
|
||||
|
|
|
@ -126,7 +126,7 @@ buffers.")
|
|||
(define-public gimp
|
||||
(package
|
||||
(name "gimp")
|
||||
(version "2.8.18")
|
||||
(version "2.8.22")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.gimp.org/pub/gimp/v"
|
||||
|
@ -134,10 +134,10 @@ buffers.")
|
|||
"/gimp-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0halh6sl3d2j9gahyabj6h6r3yyldcy7sfb4qrfazpkqqr3j5p9r"))))
|
||||
"12k3lp938qdc9cqj29scg55f3bb8iav2fysd29w0s49bqmfa71wi"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"doc")) ;8 MiB of gtk-doc HTML
|
||||
"doc")) ;5 MiB of gtk-doc HTML
|
||||
(arguments
|
||||
'(#:configure-flags (list (string-append "--with-html-dir="
|
||||
(assoc-ref %outputs "doc")
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -27,12 +28,14 @@
|
|||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages llvm)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
|
@ -121,6 +124,21 @@ the mouse, keyboard and joystick functions. Freeglut is released under
|
|||
the X-Consortium license.")
|
||||
(license license:x11)))
|
||||
|
||||
;; Needed for "kiki".
|
||||
(define-public freeglut-2.8
|
||||
(package (inherit freeglut)
|
||||
(name "freeglut")
|
||||
(version "2.8.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://sourceforge/freeglut/freeglut/"
|
||||
version "/freeglut-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"16lrxxxd9ps9l69y3zsw6iy0drwjsp6m26d1937xj71alqk6dr6x"))))
|
||||
(build-system gnu-build-system)))
|
||||
|
||||
(define-public ftgl
|
||||
(package
|
||||
(name "ftgl")
|
||||
|
@ -199,17 +217,21 @@ also known as DXTn or DXTC) for Mesa.")
|
|||
(define-public mesa
|
||||
(package
|
||||
(name "mesa")
|
||||
(version "13.0.5")
|
||||
(version "17.0.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
|
||||
version "/mesa-" version ".tar.xz"))
|
||||
(uri (list (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
|
||||
"mesa-" version ".tar.xz")
|
||||
(string-append "ftp://ftp.freedesktop.org/pub/mesa/"
|
||||
version "/mesa-" version ".tar.xz")))
|
||||
(sha256
|
||||
(base32
|
||||
"11zgynii1wz17131ml1mmblpwib8m88zz2jwi5h5llh1r3iagkmz"))
|
||||
"0im3ca1vwwmkjf5w761vh7vabr4vrrdxpckr0wm974x18n2xqs8j"))
|
||||
(patches
|
||||
(search-patches "mesa-wayland-egl-symbols-check-mips.patch"))))
|
||||
(search-patches "mesa-fix-32bit-test-failures.patch"
|
||||
"mesa-wayland-egl-symbols-check-mips.patch"
|
||||
"mesa-skip-disk-cache-test.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
`(("glproto" ,glproto)
|
||||
|
@ -263,7 +285,7 @@ also known as DXTn or DXTC) for Mesa.")
|
|||
;; Without floating point texture support, drivers such as Nouveau
|
||||
;; are stuck at OpenGL 2.1 instead of OpenGL 3.0+.
|
||||
"--enable-texture-float"
|
||||
|
||||
|
||||
;; Also enable the tests.
|
||||
"--enable-gallium-tests"
|
||||
|
||||
|
@ -283,7 +305,8 @@ also known as DXTn or DXTC) for Mesa.")
|
|||
(substitute* "src/compiler/glsl/tests/lower_jumps/create_test_cases.py"
|
||||
(("/usr/bin/env bash") (which "bash")))
|
||||
(substitute* "src/intel/genxml/gen_pack_header.py"
|
||||
(("/usr/bin/env python2") (which "python")))))
|
||||
(("/usr/bin/env python2") (which "python")))
|
||||
#t))
|
||||
(add-before
|
||||
'build 'fix-dlopen-libnames
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
|
@ -307,8 +330,9 @@ also known as DXTn or DXTC) for Mesa.")
|
|||
;; it's never installed since Mesa removed its
|
||||
;; egl_gallium support.
|
||||
(("\"gbm_dri\\.so")
|
||||
(string-append "\"" out "/lib/dri/gbm_dri.so")))))))))
|
||||
(home-page "http://mesa3d.org/")
|
||||
(string-append "\"" out "/lib/dri/gbm_dri.so")))
|
||||
#t))))))
|
||||
(home-page "https://mesa3d.org/")
|
||||
(synopsis "OpenGL implementation")
|
||||
(description "Mesa is a free implementation of the OpenGL specification -
|
||||
a system for rendering interactive 3D graphics. A variety of device drivers
|
||||
|
@ -612,3 +636,35 @@ library for OpenGL. It has lean API modeled after HTML5 canvas API. It is
|
|||
aimed to be a practical and fun toolset for building scalable user interfaces
|
||||
and visualizations.")
|
||||
(license license:zlib)))
|
||||
|
||||
(define-public gl2ps
|
||||
(package
|
||||
(name "gl2ps")
|
||||
(version "1.3.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://geuz.org/gl2ps/src/gl2ps-"
|
||||
version ".tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0h1nrhmkc4qjw2ninwpj2zbgwhc0qg6pdhpsibbvry0d2bzhns4a"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("libpng" ,libpng)
|
||||
("mesa" ,mesa)
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
`(#:tests? #f)) ;; no tests
|
||||
(home-page "http://www.geuz.org/gl2ps/")
|
||||
(synopsis "OpenGL to PostScript printing library")
|
||||
(description "GL2PS is a C library providing high quality vector
|
||||
output for any OpenGL application. GL2PS uses sorting algorithms
|
||||
capable of handling intersecting and stretched polygons, as well as
|
||||
non-manifold objects. GL2PS provides many features including advanced
|
||||
smooth shading and text rendering, culling of invisible primitives and
|
||||
mixed vector/bitmap output.")
|
||||
(license (list license:lgpl2.0+
|
||||
(license:fsf-free "http://www.geuz.org/gl2ps/COPYING.GL2PS"
|
||||
"GPL-incompatible copyleft license")))))
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
;;; Copyright © 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
|
||||
;;; Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org>
|
||||
;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net>
|
||||
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
|
||||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
|
@ -21,8 +21,9 @@
|
|||
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -50,6 +51,7 @@
|
|||
#:use-module (guix build-system trivial)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages aspell)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages avahi)
|
||||
#:use-module (gnu packages base)
|
||||
|
@ -89,6 +91,7 @@
|
|||
#:use-module (gnu packages lirc)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages imagemagick)
|
||||
#:use-module (gnu packages networking)
|
||||
#:use-module (gnu packages password-utils)
|
||||
#:use-module (gnu packages pcre)
|
||||
|
@ -125,6 +128,7 @@
|
|||
#:use-module (gnu packages fonts)
|
||||
#:use-module (gnu packages qemu)
|
||||
#:use-module (gnu packages zip)
|
||||
#:use-module (gnu packages speech)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
(define-public brasero
|
||||
|
@ -147,7 +151,14 @@
|
|||
"/share/gir-1.0")
|
||||
(string-append "--with-typelibdir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib/girepository-1.0"))))
|
||||
"/lib/girepository-1.0"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'embed-growisofs
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "plugins/growisofs/burn-growisofs.c"
|
||||
(("\"growisofs") (string-append "\"" (which "growisofs"))))
|
||||
#t )))))
|
||||
(propagated-inputs
|
||||
`(("hicolor-icon-theme" ,hicolor-icon-theme)))
|
||||
(native-inputs
|
||||
|
@ -156,7 +167,8 @@
|
|||
("gobject-introspection" ,gobject-introspection)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("glib" ,glib)
|
||||
`(("dvd+rw-tools" ,dvd+rw-tools)
|
||||
("glib" ,glib)
|
||||
("gnome-doc-utils" ,gnome-doc-utils)
|
||||
("gstreamer" ,gstreamer)
|
||||
("gst-plugins-base" ,gst-plugins-base)
|
||||
|
@ -711,7 +723,7 @@ update-desktop-database: updates the database containing a cache of MIME types
|
|||
(define-public adwaita-icon-theme
|
||||
(package (inherit gnome-icon-theme)
|
||||
(name "adwaita-icon-theme")
|
||||
(version "3.22.0")
|
||||
(version "3.24.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -719,10 +731,33 @@ update-desktop-database: updates the database containing a cache of MIME types
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dyw8mm72wfpkn83vdqr0ifv5yhy565jhxrcjsd83nc7c3igd2y1"))))
|
||||
"0ai73gs44yyw276xag6db0rlpvncy23qplp4girm80ilpprrzxyc"))))
|
||||
(native-inputs
|
||||
`(("gtk-encode-symbolic-svg" ,gtk+ "bin")))))
|
||||
|
||||
(define-public tango-icon-theme
|
||||
(package
|
||||
(name "tango-icon-theme")
|
||||
(version "0.8.90")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://tango.freedesktop.org/releases/"
|
||||
"tango-icon-theme-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"034r9s944b4yikyfgn602yv7s54wdzlq0qfvqh52b9x6kbx08h79"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("icon-naming-utils" ,icon-naming-utils)
|
||||
("intltool" ,intltool)
|
||||
("imagemagick" ,imagemagick)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(home-page "http://tango-project.org/")
|
||||
(synopsis "Tango icon theme")
|
||||
(description "This is an icon theme that follows the Tango visual
|
||||
guidelines.")
|
||||
(license license:public-domain)))
|
||||
|
||||
(define-public shared-mime-info
|
||||
(package
|
||||
(name "shared-mime-info")
|
||||
|
@ -837,11 +872,11 @@ some form of information without getting in the user's way.")
|
|||
(home-page "https://wiki.gnome.org/Libpeas")
|
||||
(synopsis "GObject plugin system")
|
||||
(description
|
||||
"Libpeas is a gobject-based plugins engine, and is targetted at giving
|
||||
every application the chance to assume its own extensibility. It also has a
|
||||
set of features including, but not limited to: multiple extension points; on
|
||||
demand (lazy) programming language support for C, Python and JS; simplicity of
|
||||
the API.")
|
||||
"Libpeas is a gobject-based plugin engine, targeted at giving every
|
||||
application the chance to assume its own extensibility. It also has a set of
|
||||
features including, but not limited to: multiple extension points; on-demand
|
||||
(lazy) programming language support for C, Python and JS; simplicity of the
|
||||
API.")
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
(define-public gtkglext
|
||||
|
@ -927,7 +962,9 @@ the GNOME desktop environment.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk"))))
|
||||
"0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk"))
|
||||
(patches (search-patches "libcroco-CVE-2017-7960.patch"
|
||||
"libcroco-CVE-2017-7961.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -1822,7 +1859,7 @@ libraries written in C.")
|
|||
(define-public vte
|
||||
(package
|
||||
(name "vte")
|
||||
(version "0.46.1")
|
||||
(version "0.48.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -1830,22 +1867,15 @@ libraries written in C.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ipmnfazvhzjp5pjw90mmxbkizivnh7gnlqqml94lw2rqa5wy048"))))
|
||||
"1hsqc7238862mqnva5qqdfxnhpwq3ak6zx6kbjj95cs04wcgpad3"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; XXX: fails to compile tests with the default flags.
|
||||
;; vteconv.cc:774:40:
|
||||
;; error: missing sentinel in function call [-Werror=format=]
|
||||
;; g_test_init (&argc, &argv, NULL);
|
||||
;;
|
||||
;; cc1plus: some warnings being treated as errors
|
||||
'(#:configure-flags '("CXXFLAGS=-Wformat=0")))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("intltool" ,intltool)
|
||||
("vala" ,vala)
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("glib" ,glib "bin") ; for glib-genmarshal, etc.
|
||||
("gperf" ,gperf)
|
||||
("xmllint" ,libxml2)))
|
||||
(propagated-inputs
|
||||
`(("gtk+" ,gtk+) ;required by vte-2.91.pc
|
||||
|
@ -1864,10 +1894,10 @@ editors, IDEs, etc.")
|
|||
(package
|
||||
(inherit vte)
|
||||
(name "vte-ng")
|
||||
(version "0.46.1.a")
|
||||
(version "0.48.3.a")
|
||||
(native-inputs
|
||||
`(("gtk-doc" ,gtk-doc)
|
||||
("gperf" ,gperf-3.0)
|
||||
("gperf" ,gperf)
|
||||
("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)
|
||||
|
@ -1879,7 +1909,7 @@ editors, IDEs, etc.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1c0czhsn28b5h4pk3kx89jjbdc5d2qkxhl4ywqvxfivphf2nicbp"))))
|
||||
"1wdkf090zclqy11hxdjgy8f6fgzajl0xzzirajikhbaiill7f8zh"))))
|
||||
(arguments
|
||||
`(#:configure-flags '("CXXFLAGS=-Wformat=0")
|
||||
#:phases (modify-phases %standard-phases
|
||||
|
@ -2414,7 +2444,7 @@ more fun.")
|
|||
(define-public gnome-terminal
|
||||
(package
|
||||
(name "gnome-terminal")
|
||||
(version "3.22.1")
|
||||
(version "3.24.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2423,7 +2453,7 @@ more fun.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1m5h3ck7wcvq1kfap05jwhnbpp3kmikc2qy822gnsbdjdqrm41xh"))))
|
||||
"1q303bljcr06w3ra737kq1hpjda45wk16kmrixxwldf3zkk2dgx7"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
|
@ -2811,7 +2841,7 @@ playlists in a variety of formats.")
|
|||
(define-public aisleriot
|
||||
(package
|
||||
(name "aisleriot")
|
||||
(version "3.22.1")
|
||||
(version "3.22.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -2819,7 +2849,7 @@ playlists in a variety of formats.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01ydq39kk8xvv8nbqqbh458gpmvx676sms71r1iix42z40a13caj"))))
|
||||
"0a8cir7vgi67sncl0m7cypq11amardm7r68gr3q52a11l8ajycdx"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
|
@ -3658,7 +3688,7 @@ USB transfers with your high-level application or system daemon.")
|
|||
(define-public simple-scan
|
||||
(package
|
||||
(name "simple-scan")
|
||||
(version "3.24.0")
|
||||
(version "3.24.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://launchpad.net/simple-scan/"
|
||||
|
@ -3667,7 +3697,7 @@ USB transfers with your high-level application or system daemon.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"19klldnbnknpq6ikz9x93861ywcyg0pg9ngijvw66ncbnb7lx912"))))
|
||||
"1czg21cdbd2fgqylxfnzfhhzy69gycf816d5bbaq6hb62hmq7bjy"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(inputs
|
||||
`(("gtk" ,gtk+)
|
||||
|
@ -3942,7 +3972,7 @@ classes for commonly used data structures.")
|
|||
(define-public gexiv2
|
||||
(package
|
||||
(name "gexiv2")
|
||||
(version "0.10.4")
|
||||
(version "0.10.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -3950,7 +3980,7 @@ classes for commonly used data structures.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"190www3b61spfgwx42jw8h5hsz2996jcxky48k63468avjpk33dd"))))
|
||||
"09aqsnpah71p9gx0ap2px2dyanrs7jmkkar6q114n9b7js8qh9qk"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("glib" ,glib "bin")
|
||||
|
@ -4549,7 +4579,7 @@ users.")
|
|||
(define-public network-manager
|
||||
(package
|
||||
(name "network-manager")
|
||||
(version "1.4.4")
|
||||
(version "1.6.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/NetworkManager/"
|
||||
|
@ -4557,7 +4587,7 @@ users.")
|
|||
"NetworkManager-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2"))
|
||||
"1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj"))
|
||||
(snippet
|
||||
'(begin
|
||||
(use-modules (guix build utils))
|
||||
|
@ -4601,12 +4631,14 @@ users.")
|
|||
;; cope with being already in the Guix build jail as that jail
|
||||
;; lacks some features that they would like to proxy over (like
|
||||
;; a /sys mount).
|
||||
(substitute* '("src/platform/Makefile.in"
|
||||
"src/devices/Makefile.in")
|
||||
(("SUBDIRS = tests") ""))
|
||||
(substitute* '("src/tests/Makefile.in")
|
||||
(("\ttest-route-manager-linux") "\t")
|
||||
(("\ttest-route-manager-fake") "\t"))
|
||||
(substitute* '("Makefile.in")
|
||||
(("src/platform/tests/test-address-linux") " ")
|
||||
(("src/platform/tests/test-cleanup-linux") " ")
|
||||
(("src/platform/tests/test-link-linux") " ")
|
||||
(("src/platform/tests/test-route-linux") " ")
|
||||
(("src/devices/tests/test-arping") " ")
|
||||
(("src/devices/tests/test-lldp") " ")
|
||||
(("src/tests/test-route-manager-linux") " "))
|
||||
#t))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
|
@ -4619,13 +4651,17 @@ users.")
|
|||
"sysconfdir=/tmp"
|
||||
"rundir=/tmp"
|
||||
"statedir=/tmp"
|
||||
"nmstatedir=/tmp/nm"
|
||||
"install")))))))
|
||||
(propagated-inputs
|
||||
`(("glib" ,glib)))
|
||||
(native-inputs
|
||||
`(("glib:bin" ,glib "bin") ; for gdbus-codegen
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("docbook-xsl" ,docbook-xsl)
|
||||
("intltool" ,intltool)
|
||||
("libxslt" ,libxslt)
|
||||
("libxml2" ,libxml2)
|
||||
("pkg-config" ,pkg-config)
|
||||
;; For testing.
|
||||
("python" ,python-wrapper)
|
||||
|
@ -4637,6 +4673,7 @@ users.")
|
|||
("gnutls" ,gnutls)
|
||||
("iptables" ,iptables)
|
||||
("isc-dhcp" ,isc-dhcp)
|
||||
("jansson" ,jansson)
|
||||
("libgcrypt" ,libgcrypt)
|
||||
("libgudev" ,libgudev)
|
||||
("libndp" ,libndp)
|
||||
|
@ -4960,6 +4997,7 @@ properties, screen resolution, and other GNOME parameters.")
|
|||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(patches (search-patches "gnome-shell-CVE-2017-8288.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"16smvjfrpyfphv479hjky5261hgl4kli4q86bcb2b8xdcav4w3yq"))))
|
||||
|
@ -5210,7 +5248,7 @@ files.")
|
|||
(define-public baobab
|
||||
(package
|
||||
(name "baobab")
|
||||
(version "3.22.1")
|
||||
(version "3.24.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -5219,7 +5257,7 @@ files.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zwpzj6hbvcyw1ymqzn3zw8w4h29ad7411crbkbh71c8jwbwpssv"))))
|
||||
"0gzwzn8p0agidjq3wnkxcsny6jhqph3yqscqjqd7blgkz5nyk02r"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(native-inputs
|
||||
`(("intltool" ,intltool)
|
||||
|
@ -5301,7 +5339,7 @@ beautifying border effects.")
|
|||
(define-public dconf-editor
|
||||
(package
|
||||
(name "dconf-editor")
|
||||
(version "3.22.1")
|
||||
(version "3.22.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -5310,7 +5348,7 @@ beautifying border effects.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"09n1ljryjgkmxwly542zb2dh9j7h76chc0br2bbhrhkwvjjmc3ha"))))
|
||||
"1939yq3fl55c2dqkc6nzp6cbpxq9sli74gdj0rj7c50pwvbngwam"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
@ -5997,3 +6035,146 @@ for process dependencies, icons for processes, the ability to hide processes,
|
|||
graphical time histories of CPU/memory/swap usage and the ability to
|
||||
kill/reinice processes.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public python-pyatspi
|
||||
(package
|
||||
(name "python-pyatspi")
|
||||
(version "2.24.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://gnome/sources/pyatspi/"
|
||||
(version-major+minor version)
|
||||
"/pyatspi-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"14m6y27ziqc9f6339gjz49mlsk6mrsyg4bkj055cdzc7sfjlgvz7"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("python" ,python)
|
||||
("python-pygobject" ,python-pygobject)))
|
||||
(synopsis "Python client bindings for D-Bus AT-SPI")
|
||||
(home-page "https://wiki.linuxfoundation.org/accessibility\
|
||||
/atk/at-spi/at-spi_on_d-bus")
|
||||
(description
|
||||
"This package includes a python client library for the AT-SPI D-Bus
|
||||
accessibility infrastructure.")
|
||||
(license license:lgpl2.0)
|
||||
(properties '((upstream-name . "pyatspi")))))
|
||||
|
||||
(define-public orca
|
||||
(package
|
||||
(name "orca")
|
||||
(version "3.24.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://gnome/sources/" name "/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1la6f815drykrgqf791jx1dda6716cfv6052frqp7nhjxr75xg97"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'qualify-xkbcomp
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((xkbcomp (string-append
|
||||
(assoc-ref inputs "xkbcomp") "/bin/xkbcomp")))
|
||||
(substitute* "src/orca/orca.py"
|
||||
(("'xkbcomp'") (format #f "'~a'" xkbcomp))))
|
||||
#t))
|
||||
(add-after 'install 'wrap-orca
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(prog (string-append out "/bin/orca")))
|
||||
(wrap-program prog
|
||||
`("GI_TYPELIB_PATH" ":" prefix
|
||||
(,(getenv "GI_TYPELIB_PATH")))
|
||||
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix
|
||||
(,(getenv "GST_PLUGIN_SYSTEM_PATH")))
|
||||
`("PYTHONPATH" ":" prefix
|
||||
(,(getenv "PYTHONPATH")))))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("intltool" ,intltool)
|
||||
("itstool" ,itstool)
|
||||
("pkg-config" ,pkg-config)
|
||||
("xmllint" ,libxml2)))
|
||||
(inputs
|
||||
`(("at-spi2-atk" ,at-spi2-atk)
|
||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
||||
("gstreamer" ,gstreamer)
|
||||
("gst-plugins-base" ,gst-plugins-base)
|
||||
("gst-plugins-good" ,gst-plugins-good)
|
||||
("gtk+" ,gtk+)
|
||||
("python" ,python)
|
||||
("python-pygobject" ,python-pygobject)
|
||||
("python-pyatspi" ,python-pyatspi)
|
||||
("python-speechd" ,speech-dispatcher)
|
||||
("xkbcomp" ,xkbcomp)))
|
||||
(synopsis
|
||||
"Screen reader for individuals who are blind or visually impaired")
|
||||
(home-page "https://wiki.gnome.org/Projects/Orca")
|
||||
(description
|
||||
"Orca is a screen reader that provides access to the graphical desktop
|
||||
via speech and refreshable braille. Orca works with applications and toolkits
|
||||
that support the Assistive Technology Service Provider Interface (AT-SPI).")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public gspell
|
||||
(package
|
||||
(name "gspell")
|
||||
(version "1.3.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1n4kd5i11l79h8bpvx3cz79ww0b4z89y99h4czvyg80qlarn585w"))
|
||||
(patches (search-patches "gspell-dash-test.patch"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'pre-check
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Tests require a running X server.
|
||||
(system "Xvfb :1 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
|
||||
;; For the missing /etc/machine-id.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||
|
||||
;; Allow Enchant and its Aspell backend to find the en_US
|
||||
;; dictionary.
|
||||
(setenv "ASPELL_DICT_DIR"
|
||||
(string-append (assoc-ref inputs "aspell-dict-en")
|
||||
"/lib/aspell"))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("enchant" ,enchant)
|
||||
("iso-codes" ,iso-codes)
|
||||
("gtk+" ,gtk+)
|
||||
("glib" ,glib)))
|
||||
(native-inputs
|
||||
`(("glib" ,glib "bin")
|
||||
("pkg-config" ,pkg-config)
|
||||
("xmllint" ,libxml2)
|
||||
|
||||
;; For tests.
|
||||
("xorg-server" ,xorg-server)
|
||||
("aspell-dict-en" ,aspell-dict-en)))
|
||||
(home-page "https://wiki.gnome.org/Projects/gspell")
|
||||
(synopsis "GNOME's alternative spell checker")
|
||||
(description
|
||||
"gspell provides a flexible API to add spell-checking to a GTK+
|
||||
application. It provides a GObject API, spell-checking to text entries and
|
||||
text views, and buttons to choose the language.")
|
||||
(license license:gpl2+)))
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
(define-public gnucash
|
||||
(package
|
||||
(name "gnucash")
|
||||
(version "2.6.15")
|
||||
(version "2.6.16")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -50,7 +50,7 @@
|
|||
version "/gnucash-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bnvnv1sxv85bgpfklykbhymjl4sbfqc1z9as5ym97s3cf1fn68n"))
|
||||
"1088rssg9xgwi3wdfrhdcga46gby6lrd9a1fvn9zq456lscn4m9c"))
|
||||
(patches (search-patches "gnucash-price-quotes-perl.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
|
||||
;;; Copyright © 2016, 2017 ng0 <ng0@no-reply.pragmatique.xyz>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -184,14 +184,14 @@ and support for SSL3 and TLS.")
|
|||
(define-public gnurl
|
||||
(package
|
||||
(name "gnurl")
|
||||
(version "7.53.1")
|
||||
(version "7.54.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gnunet.org/sites/default/files/"
|
||||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ah2304cm6y7d201vdph170mrwxmg6r72v2zsxzjn0jk68d8kb6d"))))
|
||||
"1ww346cdsxln6iq158a4wm38bmicg5wspd2c83gnqf1glx22hza0"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"doc")) ; 1.5 MiB of man3 pages
|
||||
|
|
|
@ -192,16 +192,14 @@ specifications are building blocks of S/MIME and TLS.")
|
|||
(define-public npth
|
||||
(package
|
||||
(name "npth")
|
||||
(version "1.3")
|
||||
(version "1.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://gnupg/npth/npth-"
|
||||
version ".tar.bz2"))
|
||||
(uri (string-append "mirror://gnupg/npth/npth-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0am86vblapwz84254qpmhz0chk70g6qzh3wdxcs0gvba8d01ka5w"))))
|
||||
"1wpijvxg5svj893q9vp5r83d9ipwhpbyphb55m89l5m36qc185c9"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://www.gnupg.org")
|
||||
(synopsis "Non-preemptive thread library")
|
||||
|
@ -217,15 +215,14 @@ compatible to GNU Pth.")
|
|||
(define-public gnupg
|
||||
(package
|
||||
(name "gnupg")
|
||||
(version "2.1.19")
|
||||
(version "2.1.21")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
|
||||
".tar.bz2"))
|
||||
(patches (search-patches "gnupg-2.1-fix-Y2038-test-failure.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1w4vccmb5l50lm4yrz9vkdj7whbfvzx543r55362kkj1aqgyvk26"))))
|
||||
"1p97limv29p01y79mgnzpwixa50lv53wgdl3ymk9idkmpaldisks"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -371,7 +368,7 @@ libskba (working with X.509 certificates and CMS data).")
|
|||
(define-public gpgme
|
||||
(package
|
||||
(name "gpgme")
|
||||
(version "1.8.0")
|
||||
(version "1.9.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -379,7 +376,7 @@ libskba (working with X.509 certificates and CMS data).")
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0csx3qnycwm0n90ql6gs65if5xi4gqyzzy21fxs2xqicghjrfq2r"))))
|
||||
"1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
;; Needs to be propagated because gpgme.h includes gpg-error.h.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
|
||||
;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -22,7 +22,10 @@
|
|||
#:use-module (guix packages)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (gnu packages libffcall)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages texinfo)
|
||||
|
@ -30,7 +33,33 @@
|
|||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages pkg-config))
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages xml))
|
||||
|
||||
(define-public gnustep-make
|
||||
(package
|
||||
(name "gnustep-make")
|
||||
(version "2.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://ftp.gnustep.org/pub/gnustep/core/"
|
||||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1khiygfkz0zhh9b5nybn40g0xnnjxchk24n49hff1bwanszir84h"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ; no check target
|
||||
(native-inputs
|
||||
`(("which" ,which)))
|
||||
(home-page "http://gnustep.org")
|
||||
(synopsis "GNUstep make package")
|
||||
(description "The makefile package is a simple, powerful and extensible way
|
||||
to write makefiles for a GNUstep-based project. It allows the user to write a
|
||||
project without having to deal with the complex issues associated with
|
||||
configuration, building, installation, and packaging. It also allows the user
|
||||
to easily create cross-compiled binaries.")
|
||||
(license gpl3+)))
|
||||
|
||||
(define-public windowmaker
|
||||
(package
|
||||
|
@ -244,7 +273,9 @@ display, and can run a user-specified program on mouse click.")
|
|||
name "/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"101grahd80n97y2dczb629clmcgiavdpbbwy78kk5wgs362m12z3"))))
|
||||
"101grahd80n97y2dczb629clmcgiavdpbbwy78kk5wgs362m12z3"))
|
||||
(patches
|
||||
(search-patches "wmfire-update-for-new-gdk-versions.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("gtk+" ,gtk+-2)
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2017 ng0 <ng0@no-reply.pragmatique.xyz>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -30,10 +32,10 @@
|
|||
#:use-module (guix download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gstreamer)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages libcanberra)
|
||||
|
@ -56,7 +58,8 @@
|
|||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages zip))
|
||||
#:use-module (gnu packages zip)
|
||||
#:use-module (gnu packages readline))
|
||||
|
||||
(define-public mozjs
|
||||
(package
|
||||
|
@ -158,6 +161,92 @@ in C/C++.")
|
|||
`(("libffi" ,libffi)
|
||||
("zlib" ,zlib)))))
|
||||
|
||||
(define-public mozjs-38
|
||||
(package
|
||||
(inherit mozjs)
|
||||
(name "mozjs")
|
||||
(version "38.2.1.rc0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://people.mozilla.org/~sstangl/"
|
||||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681"))
|
||||
(patches
|
||||
(search-patches
|
||||
;; See https://bugzilla.mozilla.org/show_bug.cgi?id=1269317 for
|
||||
;; GCC 6 compatibility.
|
||||
|
||||
"mozjs38-version-detection.patch" ; for 0ad
|
||||
"mozjs38-tracelogger.patch"
|
||||
|
||||
;; See https://bugzilla.mozilla.org/show_bug.cgi?id=1339931.
|
||||
"mozjs38-pkg-config-version.patch"
|
||||
"mozjs38-shell-version.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Fix incompatibility with sed 4.4.
|
||||
(substitute* "js/src/configure"
|
||||
(("\\^\\[:space:\\]") "^[[:space:]]"))
|
||||
|
||||
;; The headers are symlinks to files that are in /tmp, so they
|
||||
;; end up broken. Copy them instead.
|
||||
(substitute*
|
||||
"python/mozbuild/mozbuild/backend/recursivemake.py"
|
||||
(("\\['dist_include'\\].add_symlink")
|
||||
"['dist_include'].add_copy"))
|
||||
|
||||
;; Remove bundled libraries.
|
||||
(for-each delete-file-recursively
|
||||
'("intl"
|
||||
"js/src/ctypes/libffi"
|
||||
"js/src/ctypes/libffi-patches"
|
||||
"modules/zlib"))
|
||||
#t))))
|
||||
(arguments
|
||||
`(;; XXX: parallel build fails, lacking:
|
||||
;; mkdir -p "system_wrapper_js/"
|
||||
#:parallel-build? #f
|
||||
;; See https://bugzilla.mozilla.org/show_bug.cgi?id=1008470.
|
||||
#:tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(chdir "js/src")
|
||||
(setenv "SHELL" (which "sh"))
|
||||
(setenv "CONFIG_SHELL" (which "sh"))
|
||||
(zero? (system* "./configure"
|
||||
(string-append "--prefix=" out)
|
||||
"--enable-ctypes"
|
||||
"--enable-gcgenerational"
|
||||
"--enable-optimize"
|
||||
"--enable-pie"
|
||||
"--enable-readline"
|
||||
"--enable-shared-js"
|
||||
"--enable-system-ffi"
|
||||
"--enable-threadsafe"
|
||||
"--enable-xterm-updates"
|
||||
"--with-system-icu"
|
||||
"--with-system-nspr"
|
||||
"--with-system-zlib"
|
||||
|
||||
;; Intl API requires bundled ICU.
|
||||
"--without-intl-api"))))))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python-2" ,python-2)))
|
||||
(inputs
|
||||
`(("libffi" ,libffi)
|
||||
("readline" ,readline)
|
||||
("icu4c" ,icu4c)
|
||||
("zlib" ,zlib)))))
|
||||
|
||||
(define-public nspr
|
||||
(package
|
||||
(name "nspr")
|
||||
|
@ -193,7 +282,7 @@ in the Mozilla clients.")
|
|||
(define-public nss
|
||||
(package
|
||||
(name "nss")
|
||||
(version "3.29.3")
|
||||
(version "3.30.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (let ((version-with-underscores
|
||||
|
@ -204,9 +293,10 @@ in the Mozilla clients.")
|
|||
"nss-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"1sz1r2iml9bhd4iqiqz75gii855a25895vpy9scjky0y4lqwrp9m"))
|
||||
"096frzvyp3z257x84rxknscfgsbavzh2a0gyibx7kvmw4vzpfjhd"))
|
||||
;; Create nss.pc and nss-config.
|
||||
(patches (search-patches "nss-pkgconfig.patch"
|
||||
"nss-disable-long-b64-tests.patch"
|
||||
"nss-increase-test-timeout.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "bin"))
|
||||
|
@ -239,6 +329,16 @@ in the Mozilla clients.")
|
|||
`((setenv "USE_64" "1")))
|
||||
(_
|
||||
'()))
|
||||
;; The timeout values in "increase-test-timeouts" are still
|
||||
;; too low, so apply this workaround on armhf for now to avoid
|
||||
;; rebuilding on all platforms. This should be incorporated in
|
||||
;; the patch for the next update.
|
||||
;; https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00472.html
|
||||
,@(if (string-prefix? "armhf" (or (%current-target-system)
|
||||
(%current-system)))
|
||||
`((substitute* "nss/gtests/ssl_gtest/tls_connect.cc"
|
||||
(("25000\\);") "300000);")))
|
||||
'())
|
||||
#t))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
|
@ -300,10 +400,10 @@ standards.")
|
|||
(license license:mpl2.0)))
|
||||
|
||||
(define (mozilla-patch file-name changeset hash)
|
||||
"Return an origin for CHANGESET from the mozilla-esr45 repository."
|
||||
"Return an origin for CHANGESET from the mozilla-esr52 repository."
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hg.mozilla.org/releases/mozilla-esr45/raw-rev/"
|
||||
(uri (string-append "https://hg.mozilla.org/releases/mozilla-esr52/raw-rev/"
|
||||
changeset))
|
||||
(sha256 (base32 hash))
|
||||
(file-name file-name)))
|
||||
|
@ -311,7 +411,7 @@ standards.")
|
|||
(define-public icecat
|
||||
(package
|
||||
(name "icecat")
|
||||
(version "45.7.0-gnu1")
|
||||
(version "52.1.0-gnu1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -320,62 +420,38 @@ standards.")
|
|||
"/" name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1mn73liylqzxk441f28wk326yglqs8zcwqs4zz51s8i2id2jsnv3"))
|
||||
"1wr4bc5806xzyqpi6m4rjaf61za6ylpx4g0kfk95c6yw9yhg5vqb"))
|
||||
(patches
|
||||
(list
|
||||
(search-patch "icecat-avoid-bundled-libraries.patch")
|
||||
(search-patch "icecat-binutils.patch")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt01.patch" "1a39a54b5fea" "0k3sbf2w2yng2rpv6wl9zrm5cbsgq3pslr19xwrk8sk753as79fp")
|
||||
(mozilla-patch "icecat-CVE-2017-5402.patch" "9828c3bb7b73" "0zgks0v9sqhwwkmry4daswvjwk6aqln6abx0iac1vwqqpg6swff6")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt02.patch" "fa3268a1147e" "1jyd1hvp42pz5l15agmb1jhw74b38x8xnj9ih5v4pskv41bgmyg5")
|
||||
(mozilla-patch "icecat-CVE-2017-5400.patch" "347c10e4d6d1" "1w6yrm97l477q4ripbj0nimc87p4jscabvihpncxqbq9xzc4km7p")
|
||||
(mozilla-patch "icecat-CVE-2017-5410.patch" "fe4a2cda54ad" "0spcs93hpz13d8670jgvww80f0ynrbhwbh62fkv27lpr6wmqwqh1")
|
||||
(mozilla-patch "icecat-CVE-2017-5401.patch" "c38f8546be5f" "1sa22w9kzgynsn4c6zh4d66byskk5kffzbvlzrhyzvqjddypf9p8")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt03.patch" "41c80ecafa99" "0r33arr5wcgl00zgncasiyl65bmm6jy45clxnbb75nzjmsd1zx1s")
|
||||
(mozilla-patch "icecat-CVE-2017-5405.patch" "381552c888b4" "1sjhh390cx1jqx74lxk6qd8f8ccppqgagqfhc9pnbm2m67hxvkj9")
|
||||
(mozilla-patch "icecat-CVE-2017-5407.patch" "4ba337cdb998" "0vyknizid2z9nvl31m08c7fknizhv8dh8m54apm39k8lx77vf70p")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt04.patch" "886650fac531" "18fsr5dmav96ja0dah7mj34n8mjpckp0bbc32zjyaj5qx0m4h5cw")
|
||||
(mozilla-patch "icecat-CVE-2017-5409.patch" "0a22becb23cd" "19fshrq4qkj5s0mjrads6by84gy7rsq3k57gha6sw6rvx8chjaz6")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt05.patch" "a0ead6ef09eb" "1hpsq81hhhq2a2dcq2dfndiwx93vvp5rfq0cgv6kwk2bsrq77wqq")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt06.patch" "d3fede027d06" "1aw02p367cm0ayijdiiawlb7qhab6jwqwkakj317yd1cjnmkalwr")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt07.patch" "ffca0f060bb4" "0qwisfp7idjj5nc1vp1afrf5lj66l2gp7rllkjmrqpz6cyfc708v")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt08.patch" "4aa65b44dcb9" "07j6dz2b7hp1bkfvkxwgpn2wc3hqrgjgwpaz96fcpz8yadg2fssw")
|
||||
(mozilla-patch "icecat-bug-1318914.patch" "30e2382d800f" "0w8zky5i7zc5q943x37rdvi4wbcing0q7w9fcgvnnh5li2sbrsy8")
|
||||
(mozilla-patch "icecat-CVE-2017-5408.patch" "403d2300adc2" "06r4j48rc1fd9gvmvqy68mlqah5xfxpkvwmxk0gnqc364kpq9slk")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt09.patch" "546ab5e99568" "05rdb9bm3n4lj0zq5a95xnwsb0vzirb9mbc2wf9xbi4xlamsgvvw")
|
||||
(mozilla-patch "icecat-bug-1311380.patch" "ef6eeb7f8846" "1w19is5blbrwf3wlmy6wzgabih8sxp2kmkffqcj2g4jypfwyqn73")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt10.patch" "eec69810d80e" "1r20abhw7b38igsrdpkhcfwx9i9gmcxikv4y3sjr4wkbp684f7av")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt11.patch" "fec35ce6e68b" "1imdfrs8dxz44rhsmvydh29w5j64cij6g5ggrmhvz3386xvlil2v")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt12.patch" "725e2a217722" "06gfhi2ich279rjnxi15fb4igimsxnv5w6bx4g91js8wbvp2r3v0")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt13.patch" "d905a2e3a4d9" "1ibxi2s0czj47b739zmmjzbln8lpn27hdg4b17w58vhbhzkq31cx")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt14.patch" "0032560ae945" "0md3p5cix6nzbj5m199awc9gk52pygy5s9lx3a38vh3xvd92lsbj")
|
||||
(mozilla-patch "icecat-CVE-2017-5398-pt15.patch" "91dda1e79ad8" "0b5h8fhagczfqkdgby982w6qgkw9y11zxxpdbn89rwmjpyp9nghx")
|
||||
(mozilla-patch "icecat-CVE-2017-5404.patch" "556dd9e4a9e3" "0mbdx4xn1xs67n47ys9m42lc5ny96rz21ala848yajpdlxsz680g")
|
||||
(mozilla-patch "icecat-bug-1341137-pt1.patch" "e86e0423dad1" "0dk1v7lcs61nx76qxcibha3ygqri15ldcvwwsrsayff9fq6k0v4y")
|
||||
(mozilla-patch "icecat-bug-1341137-pt2.patch" "9aebee8b8cb9" "0m7p5iprhhwdv89aqqg7fla5szw6v7x2sll4ns0zg60pk4vm6izq")
|
||||
(mozilla-patch "icecat-bug-1341137-pt3.patch" "69f3d44bdb48" "1ad7rw6nmg3c49ylqxlqqkb6cm2f0ygfzrigs6b60a2zkjqhbl0h")
|
||||
(mozilla-patch "icecat-bug-1341137-pt4.patch" "22546e2cee64" "0gbwxa3p7qkq53hwnvxcqhx8h34qmnjdxy0h3ajik4mw76vrna9s")
|
||||
(mozilla-patch "icecat-bug-1341137-pt5.patch" "e5083d8a855a" "1247vbpqzf007nigbxxqd6nwgr1dxd4p8cd0dr45afqh19vhlapj")
|
||||
(mozilla-patch "icecat-bug-1339122.patch" "b0d156c7445e" "026jp5bb565yvhkmmicgygcn1lmak85p0466yl1vnjlx1rc8n724")
|
||||
(mozilla-patch "icecat-bug-1319087.patch" "9cd44507fd65" "0mcfvby53r2150libazgrgaqrdyvl0g6cr1f01dsya3cgmc9mkcn")
|
||||
(mozilla-patch "icecat-bug-1342661.patch" "d449995ef7d9" "1kz8k2jxvhqpjgrsj7r0kqq79036lrkfnx5pvdnsl59np9128j81")
|
||||
(mozilla-patch "icecat-bug-1343261.patch" "9b5374019b58" "0v5w50r5ys4jjy1lpks280cq8paw7wdy9mrk7szzq7nlcxz90is7")
|
||||
(mozilla-patch "icecat-bug-1343552-pt1.patch" "08bc7a3330e4" "1hsvffscqc4zflni866ilylgi3a13wz0n882z85xplbhwhc9lcfj")
|
||||
(mozilla-patch "icecat-bug-1343552-pt2.patch" "8c61ebe37f1b" "1fjsr6bzfyd1zqzz2pglwh2ckys95h21wy3j4rlwkz66057z53qq")
|
||||
(mozilla-patch "icecat-bug-1340718.patch" "bfa75fc20c2b" "08gksd06lwbb5ykdrk9gh2cb9bximwxhbxl3rprz64jj2bnmd3dq")
|
||||
(mozilla-patch "icecat-bug-1345461.patch" "bcd5e51251dd" "1ms2ad8j04lz761cvdwi9rj5qv3qbjmg0zwyp3fykcf01a323ygd")
|
||||
(mozilla-patch "icecat-bug-1343505.patch" "290f10412f92" "1dsj22fkz60zfa6isnxj54clg32dwzapwh5f1vz6jsin9r67ik2p")
|
||||
(mozilla-patch "icecat-bug-1346648.patch" "9369ede30cc1" "1wrdn2aixbzifz7wyqnfi65gaiva8i746pi53z6w62lmn1hwd3ji")
|
||||
(mozilla-patch "icecat-bug-1347979.patch" "4ae2261bfab0" "1yi3jicwjy7w8f0sv5di4rx05bfpkhcwj3r6dhl5315yz4ifqy30")
|
||||
(mozilla-patch "icecat-bug-1343795.patch" "dcf468969700" "0syfq35s2r86ajmnqsxlfanvxd9ax57qkfmxpkvmk447s3mxsk08")
|
||||
(mozilla-patch "icecat-bug-1347168.patch" "5a6390274b64" "1lg5px4sncalh82y61ni9rlg50d83jmmrrvn0944x4zfrzlfaz8x")
|
||||
(mozilla-patch "icecat-bug-1341096.patch" "64158495e5ae" "1lyh8m159hhzrxj5hr0yib2sb8rkd20qxpykrf398v18s3yc08cx")
|
||||
(mozilla-patch "icecat-bug-1346654.patch" "f359ec604627" "0j6rzbnzlz8x9sj2r79d1zr4p89c5zq7y49xa4kn6am5ay3ws0ri")
|
||||
(mozilla-patch "icecat-bug-1344461.patch" "6f14d2ef7981" "0n24hqvjj7vxqdvxhk38swnmvcv7h7vvn5invbidhv22m0qqzs2c")
|
||||
(mozilla-patch "icecat-bug-1292534.patch" "c709d4b36145" "18cdck3fr4a1ygszb6qk07g6fi3kv6i697pjfcipvqrk358qb0hq")
|
||||
(mozilla-patch "icecat-bug-1336830.patch" "18e355831dd5" "042487xhq9zkky3pxiqy1rpy69z0j20w0jnl7kwg2j1bzfbnniip")
|
||||
(mozilla-patch "icecat-bug-1336832.patch" "ebeb0b45a84b" "17ch2aqsrnkiwbnkf6x7a1cpi8jgfjhwr6wp0bsa89s8v1dax6w4")
|
||||
(mozilla-patch "icecat-bug-1349946.patch" "ccbecbe17a45" "19vwmhvqarpzai8mcq6i7szkrp1h9m8v5lyimkmmdlmagrivjw7f")))
|
||||
(mozilla-patch "icecat-bug-1342366.patch" "fb43f6690a26" "1vnkjpq2bcqwzmjkgyqv8wj0ndrrsyix3qy1rsb5is6pjmi9sbaa")
|
||||
(mozilla-patch "icecat-bug-1343818.patch" "90f870bbec29" "0mbki955f71n4yr9p0yc7kh5jwq7vs4bs4rhaazdncirbr564hm6")
|
||||
(mozilla-patch "icecat-bug-1348454.patch" "c1cd8a02669f" "1wf0107763rw45kxkak7478vlax06ay7076cbm7ysxl7vijbr52w")
|
||||
(mozilla-patch "icecat-bug-1297111.patch" "2553531f83b9" "0ibf59pa8czdyhc25sas6zhh2gf1k8vr8fklis2b1ms3n1qnzrha")
|
||||
(mozilla-patch "icecat-bug-1355873.patch" "9ee455ddcd68" "0d38hi4556635g9ag805vfyffdgfsp4a8v3d9ldffdp99ypv2ixj")
|
||||
(mozilla-patch "icecat-bug-1348424-pt1.patch" "6472c7006a73" "1fgydas23fzj49n4g43133bgjn98b2h38bii4knl7z7pm3fs2wws")
|
||||
(mozilla-patch "icecat-bug-1348424-pt2.patch" "0d5a26b29816" "03mkghl9i83jk1axr8bvw8la6shbggkabf23if8a9vi5jdv8182x")
|
||||
(mozilla-patch "icecat-bug-1357092.patch" "e78c943af07f" "0r830k6hja8z9rjk2nqjg8zfzr0wjcnic8rddh7jmc1inr1w3crm")
|
||||
(mozilla-patch "icecat-bug-1352093.patch" "d7c06f2d0d13" "1ahyns5v37w91bilvb3pa8kkdzkkn3fcxmi49jr5bycjlawljrm4")
|
||||
(mozilla-patch "icecat-bug-1349595.patch" "9071c7d4cc9c" "12128sf8s3zwv2w16kfl5jry9d6ky7hvps2006184rg23p32aj6n")
|
||||
(mozilla-patch "icecat-bug-1336979.patch" "8bbc7b586d68" "0c13imyp1nq18in3yb1zcyi41b69svh4fn8msyj0c2lhbf8qnqcw")
|
||||
(mozilla-patch "icecat-bug-1352556.patch" "6d80ca63ff8b" "0s893fn6v0p323lcnl4cbkg1zd7gs1p0bw76ki6cmiapkn63gs13")
|
||||
(mozilla-patch "icecat-bug-1359547.patch" "43d7b98d8743" "1dhgy1jkvn3c4k27hbv8p16w7l09b8hd4w9zzpk8dpn4h78ncs3h")
|
||||
(mozilla-patch "icecat-CVE-2017-5031.patch" "bd4fcdee9a06" "0xz1r342023a0bsllhjbzn6v75lpqznwacqyikb7q8i4hxkxh78a")
|
||||
(mozilla-patch "icecat-bug-1346499.patch" "747fd6c81983" "00iscyn4wr69205ppiaghlnd32845f5lcsl303v0fcdd4d1v04vc")
|
||||
(mozilla-patch "icecat-bug-1334443-pt1.patch" "16201e8478df" "1k91xaai25vn1svkaldnsd2s8br3fgvnk5l54k3n3lk3m5vj55hv")
|
||||
(mozilla-patch "icecat-bug-1334443-pt2.patch" "f100e5cf3bcb" "1cgbbbnkrd3ydfw99rhnpqdp5zq65537mg8sa1s9ajxkjjd1dkwj")
|
||||
(mozilla-patch "icecat-bug-1354810.patch" "e579ef6e8d11" "0cmrh8dl85lzjxpbni08xbs8qq15sljnpg70a7rsl0jdbgih3mdx")
|
||||
(mozilla-patch "icecat-bug-1356755.patch" "4a3fce67b52d" "126i9nwxsb3sjwb7dvhafacq86glnhx7r7jjv0h9v21s1w0kx4wj")
|
||||
(mozilla-patch "icecat-bug-1273265.patch" "7902fea300b8" "1jkrl8hdycsi17dd1m1vvl6gm1skhpf10q2m29zwfr8l40fd6a3q")
|
||||
(mozilla-patch "icecat-bug-1353204.patch" "b5a21502aeff" "13rbrhvr37w95av9d4hkgi913nq0j6k2iijydylvprcn18cwibp0")
|
||||
(mozilla-patch "icecat-bug-1028195.patch" "69a5ca2bf867" "0q8cgi6837ikpg7gsvywmzhq0i102845apcbrd6mw0205qqsnw5c")
|
||||
(mozilla-patch "icecat-bug-1347835.patch" "bc635f45af37" "1fny422l6yc80901x6swybr8nk0in1wxfgy97ky4bdkcqlnmzpqv")
|
||||
(mozilla-patch "icecat-bug-1241066.patch" "b922ca70cce5" "09hcf9rm7ng3vj5y267w0c9h6pqinnz8gjlkwx1337xh43mdvqjv")
|
||||
(mozilla-patch "icecat-bug-1346012.patch" "1ce6d0652921" "163ji64a86h682frh1jq016w1mjf8g24r8cni0irsdmiihis7zxc")
|
||||
(mozilla-patch "icecat-bug-1324140.patch" "8886f9cd5dd3" "0byabs9md8r3pc4r67sv2759427n1za0gfayln40nx47n2p52kmg")
|
||||
(mozilla-patch "icecat-bug-1342552.patch" "ad995e90916b" "02nq9sg675p26z99nr2pykbz51hi2phf0gmrb1bjpq9pjbll7gsa")
|
||||
(mozilla-patch "icecat-bug-1355039.patch" "4ae71415fecf" "0yfkkdkkimad9a3w734xx85lb7hrl870c8k8an7w78fq3vl3fjnd")))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -433,9 +509,8 @@ standards.")
|
|||
("dbus-glib" ,dbus-glib)
|
||||
("gdk-pixbuf" ,gdk-pixbuf)
|
||||
("glib" ,glib)
|
||||
("gstreamer" ,gstreamer)
|
||||
("gst-plugins-base" ,gst-plugins-base)
|
||||
("gtk+" ,gtk+-2)
|
||||
("gtk+" ,gtk+)
|
||||
("gtk+-2" ,gtk+-2)
|
||||
("pango" ,pango)
|
||||
("freetype" ,freetype)
|
||||
("hunspell" ,hunspell)
|
||||
|
@ -449,6 +524,7 @@ standards.")
|
|||
("libxcomposite" ,libxcomposite)
|
||||
("libxt" ,libxt)
|
||||
("libffi" ,libffi)
|
||||
("ffmpeg" ,ffmpeg)
|
||||
("libvpx" ,libvpx)
|
||||
("icu4c" ,icu4c)
|
||||
("pixman" ,pixman)
|
||||
|
@ -460,19 +536,19 @@ standards.")
|
|||
("sqlite" ,sqlite)
|
||||
("startup-notification" ,startup-notification)
|
||||
("unzip" ,unzip)
|
||||
("yasm" ,yasm)
|
||||
("zip" ,zip)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("python" ,python-2) ; Python 3 not supported
|
||||
("python2-pysqlite" ,python2-pysqlite)
|
||||
("yasm" ,yasm)
|
||||
("pkg-config" ,pkg-config)
|
||||
("autoconf" ,autoconf-2.13)
|
||||
("which" ,which)))
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
#:out-of-source? #t ; must be built outside of the source directory
|
||||
#:parallel-build? #f
|
||||
|
||||
;; XXX: There are RUNPATH issues such as
|
||||
;; $prefix/lib/icecat-31.6.0/plugin-container NEEDing libmozalloc.so,
|
||||
|
@ -480,17 +556,11 @@ standards.")
|
|||
;; practice somehow. See <http://hydra.gnu.org/build/378133>.
|
||||
#:validate-runpath? #f
|
||||
|
||||
#:configure-flags '("--enable-default-toolkit=cairo-gtk2"
|
||||
"--enable-pango"
|
||||
#:configure-flags '("--enable-default-toolkit=cairo-gtk3"
|
||||
"--enable-gio"
|
||||
"--enable-svg"
|
||||
"--enable-canvas"
|
||||
"--enable-mathml"
|
||||
"--enable-startup-notification"
|
||||
"--enable-pulseaudio"
|
||||
"--enable-gstreamer=1.0"
|
||||
|
||||
"--disable-gnomevfs"
|
||||
"--disable-gconf"
|
||||
"--disable-gnomeui"
|
||||
|
||||
|
@ -547,16 +617,6 @@ standards.")
|
|||
(utime file early-1980 early-1980))
|
||||
#t))
|
||||
#t)))
|
||||
(add-after
|
||||
'unpack 'remove-h264parse-from-blacklist
|
||||
(lambda _
|
||||
;; Remove h264parse from gstreamer format helper blacklist. It
|
||||
;; was put there to work around a bug in a pre-1.0 version of
|
||||
;; gstreamer. See:
|
||||
;; https://www.mozilla.org/en-US/security/advisories/mfsa2015-47/
|
||||
(substitute* "dom/media/gstreamer/GStreamerFormatHelper.cpp"
|
||||
(("^ \"h264parse\",\n") ""))
|
||||
#t))
|
||||
(add-after
|
||||
'unpack 'use-skia-by-default
|
||||
(lambda _
|
||||
|
@ -580,10 +640,11 @@ standards.")
|
|||
;; calls to dlopen or PR_LoadLibrary, but that didn't seem to
|
||||
;; work. More investigation is needed.
|
||||
(substitute* "toolkit/library/moz.build"
|
||||
(("^# This needs to be last")
|
||||
"OS_LIBS += [
|
||||
(("^# This library needs to be last" all)
|
||||
(string-append "OS_LIBS += [
|
||||
'GL', 'gnome-2', 'canberra', 'Xss', 'cups', 'gssapi_krb5',
|
||||
'gstreamer-1.0', 'gstapp-1.0', 'gstvideo-1.0' ]\n\n"))
|
||||
'avcodec', 'avutil', 'pulse' ]\n\n"
|
||||
all)))
|
||||
#t))
|
||||
(replace
|
||||
'configure
|
||||
|
@ -600,6 +661,7 @@ standards.")
|
|||
,@configure-flags)))
|
||||
(setenv "SHELL" bash)
|
||||
(setenv "CONFIG_SHELL" bash)
|
||||
(setenv "AUTOCONF" (which "autoconf")) ; must be autoconf-2.13
|
||||
(mkdir "../build")
|
||||
(chdir "../build")
|
||||
(format #t "build directory: ~s~%" (getcwd))
|
||||
|
@ -661,7 +723,16 @@ standards.")
|
|||
(copy-file file (string-append icons "/icecat.png"))))
|
||||
'("default16.png" "default22.png" "default24.png"
|
||||
"default32.png" "default48.png" "content/icon64.png"
|
||||
"mozicon128.png" "default256.png")))))))))
|
||||
"mozicon128.png" "default256.png"))))))
|
||||
;; This fixes the file chooser crash that happens with GTK 3.
|
||||
(add-after 'install 'wrap-program
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(lib (string-append out "/lib"))
|
||||
(gtk (assoc-ref inputs "gtk+"))
|
||||
(gtk-share (string-append gtk "/share")))
|
||||
(wrap-program (car (find-files lib "^icecat$"))
|
||||
`("XDG_DATA_DIRS" ":" prefix (,gtk-share)))))))))
|
||||
(home-page "https://www.gnu.org/software/gnuzilla/")
|
||||
(synopsis "Entirely free browser derived from Mozilla Firefox")
|
||||
(description
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue