Merge branch 'master' into staging
This commit is contained in:
commit
61b1df6f27
|
@ -23,7 +23,13 @@
|
|||
(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))
|
||||
|
|
|
@ -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
|
||||
|
|
143
Makefile.am
143
Makefile.am
|
@ -28,6 +28,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 = \
|
||||
|
@ -46,6 +50,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 \
|
||||
|
@ -119,6 +124,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 \
|
||||
|
@ -205,8 +211,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 \
|
||||
|
@ -223,7 +229,7 @@ EXAMPLES = \
|
|||
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
|
||||
|
||||
nobase_dist_guilemodule_DATA = \
|
||||
$(MODULES) $(AUX_FILES) $(EXAMPLES) \
|
||||
$(MODULES) $(MODULES_NOT_COMPILED) $(AUX_FILES) $(EXAMPLES) \
|
||||
$(MISC_DISTRO_FILES)
|
||||
nobase_nodist_guilemodule_DATA = guix/config.scm
|
||||
nobase_nodist_guileobject_DATA = $(GOBJECTS)
|
||||
|
@ -275,6 +281,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 \
|
||||
|
@ -379,14 +386,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
|
||||
|
@ -400,7 +409,6 @@ EXTRA_DIST = \
|
|||
TODO \
|
||||
CODE-OF-CONDUCT \
|
||||
.dir-locals.el \
|
||||
gnu/build/svg.scm \
|
||||
build-aux/build-self.scm \
|
||||
build-aux/compile-all.scm \
|
||||
build-aux/hydra/evaluate.scm \
|
||||
|
@ -411,6 +419,7 @@ EXTRA_DIST = \
|
|||
build-aux/download.scm \
|
||||
build-aux/generate-authors.scm \
|
||||
build-aux/test-driver.scm \
|
||||
build-aux/update-guix-package.scm \
|
||||
build-aux/run-system-tests.scm \
|
||||
d3.v3.js \
|
||||
graph.js \
|
||||
|
@ -487,34 +496,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. 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 \
|
||||
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; \
|
||||
|
@ -530,8 +547,98 @@ 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
|
||||
|
||||
# Prefix of the GuixSD installation image file name.
|
||||
GUIXSD_IMAGE_BASE = guixsd-usb-install-$(PACKAGE_VERSION)
|
||||
|
||||
# Size of the installation image (for x86_64 typically).
|
||||
GUIXSD_INSTALLATION_IMAGE_SIZE ?= 950MiB
|
||||
|
||||
# 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).
|
||||
release: distcheck
|
||||
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 \
|
||||
--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
|
||||
@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`"
|
||||
|
||||
# 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 \
|
||||
|
@ -561,9 +668,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 release
|
||||
|
||||
## -------------- ##
|
||||
## Silent rules. ##
|
||||
|
|
|
@ -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,14 +148,18 @@ 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")
|
||||
(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")
|
||||
(string-append #$guile-ssh "/lib/guile/"
|
||||
#$(effective-version)
|
||||
"/site-ccache")
|
||||
%load-compiled-path)))
|
||||
|
||||
;; XXX: The 'guile-ssh' package prior to Guix commit 92b7258 was
|
||||
|
@ -146,13 +194,21 @@ files."
|
|||
(current-error-port)
|
||||
(%make-void-port "w")))))
|
||||
|
||||
(mlet %store-monad ((guile (guile-for-build)))
|
||||
(gexp->derivation "guix-latest" builder
|
||||
#:modules '((guix build pull)
|
||||
(guix build utils))
|
||||
(guix build utils)
|
||||
|
||||
;; 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))))
|
||||
#: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"))
|
||||
|
||||
|
|
|
@ -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."
|
||||
|
|
|
@ -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.
|
||||
|
|
140
doc/guix.texi
140
doc/guix.texi
|
@ -34,7 +34,8 @@ Copyright @copyright{} 2017 Clément Lassieur@*
|
|||
Copyright @copyright{} 2017 Mathieu Othacehe@*
|
||||
Copyright @copyright{} 2017 Federico Beffa@*
|
||||
Copyright @copyright{} 2017 Carlo Zancanaro@*
|
||||
Copyright @copyright{} 2017 Thomas Danckaert
|
||||
Copyright @copyright{} 2017 Thomas Danckaert@*
|
||||
Copyright @copyright{} 2017 humanitiesNerd
|
||||
|
||||
Permission is granted to copy, distribute and/or modify this document
|
||||
under the terms of the GNU Free Documentation License, Version 1.3 or
|
||||
|
@ -1429,11 +1430,13 @@ remove software packages, without having to know about their build
|
|||
procedures or dependencies. Guix also goes beyond this obvious set of
|
||||
features.
|
||||
|
||||
This chapter describes the main features of Guix, as well as the package
|
||||
management tools it provides. Along with the command-line interface
|
||||
described below (@pxref{Invoking guix package, @code{guix package}}),
|
||||
you may also use Emacs Interface, after installing @code{emacs-guix}
|
||||
package (run @kbd{M-x guix-help} command to start with it):
|
||||
This chapter describes the main features of Guix, as well as the
|
||||
package management tools it provides. Along with the command-line
|
||||
interface described below (@pxref{Invoking guix package, @code{guix
|
||||
package}}), you may also use Emacs Interface (@pxref{Top,,,
|
||||
emacs-guix, The Emacs-Guix Reference Manual}), after installing
|
||||
@code{emacs-guix} package (run @kbd{M-x guix-help} command to start
|
||||
with it):
|
||||
|
||||
@example
|
||||
guix package -i emacs-guix
|
||||
|
@ -2387,13 +2390,13 @@ For example, to download and deploy version 0.12.0 of Guix from the
|
|||
canonical Git repo:
|
||||
|
||||
@example
|
||||
guix pull --url=http://git.savannah.gnu.org/cgit/guix.git/snapshot/v0.12.0.tar.gz
|
||||
guix pull --url=https://git.savannah.gnu.org/cgit/guix.git/snapshot/v0.12.0.tar.gz
|
||||
@end example
|
||||
|
||||
It can also be used to deploy arbitrary Git revisions:
|
||||
|
||||
@example
|
||||
guix pull --url=http://git.savannah.gnu.org/cgit/guix.git/snapshot/74d862e8a.tar.gz
|
||||
guix pull --url=https://git.savannah.gnu.org/cgit/guix.git/snapshot/74d862e8a.tar.gz
|
||||
@end example
|
||||
|
||||
@item --bootstrap
|
||||
|
@ -2401,6 +2404,8 @@ Use the bootstrap Guile to build the latest Guix. This option is only
|
|||
useful to Guix developers.
|
||||
@end table
|
||||
|
||||
In addition, @command{guix pull} supports all the common build options
|
||||
(@pxref{Common Build Options}).
|
||||
|
||||
@node Invoking guix pack
|
||||
@section Invoking @command{guix pack}
|
||||
|
@ -2879,7 +2884,8 @@ unavailable to the build process, possibly leading to a build failure.
|
|||
|
||||
Once a package definition is in place, the
|
||||
package may actually be built using the @code{guix build} command-line
|
||||
tool (@pxref{Invoking guix build}). You can easily jump back to the
|
||||
tool (@pxref{Invoking guix build}), troubleshooting any build failures
|
||||
you encounter (@pxref{Debugging Build Failures}). You can easily jump back to the
|
||||
package definition using the @command{guix edit} command
|
||||
(@pxref{Invoking guix edit}).
|
||||
@xref{Packaging Guidelines}, for
|
||||
|
@ -3321,7 +3327,8 @@ parameters, respectively.
|
|||
When the original package does not provide a suitable Ant build file,
|
||||
the parameter @code{#:jar-name} can be used to generate a minimal Ant
|
||||
build file @file{build.xml} with tasks to build the specified jar
|
||||
archive.
|
||||
archive. In this case the parameter @code{#:source-dir} can be used to
|
||||
specify the source sub-directory, defaulting to ``src''.
|
||||
|
||||
The parameter @code{#:build-target} can be used to specify the Ant task
|
||||
that should be run during the @code{build} phase. By default the
|
||||
|
@ -4832,6 +4839,7 @@ described in the subsections below.
|
|||
* Common Build Options:: Build options for most commands.
|
||||
* Package Transformation Options:: Creating variants of packages.
|
||||
* Additional Build Options:: Options specific to 'guix build'.
|
||||
* Debugging Build Failures:: Real life packaging experience
|
||||
@end menu
|
||||
|
||||
@node Common Build Options
|
||||
|
@ -4857,6 +4865,8 @@ the command-line tools.
|
|||
Keep the build tree of failed builds. Thus, if a build fails, its build
|
||||
tree is kept under @file{/tmp}, in a directory whose name is shown at
|
||||
the end of the build log. This is useful when debugging build issues.
|
||||
@xref{Debugging Build Failures}, for tips and tricks on how to debug
|
||||
build issues.
|
||||
|
||||
@item --keep-going
|
||||
@itemx -k
|
||||
|
@ -5244,6 +5254,82 @@ https://hydra.gnu.org/log/@dots{}-gdb-7.10
|
|||
You can freely access a huge library of build logs!
|
||||
@end table
|
||||
|
||||
@node Debugging Build Failures
|
||||
@subsection Debugging Build Failures
|
||||
|
||||
@cindex build failures, debugging
|
||||
When defining a new package (@pxref{Defining Packages}), you will
|
||||
probably find yourself spending some time debugging and tweaking the
|
||||
build until it succeeds. To do that, you need to operate the build
|
||||
commands yourself in an environment as close as possible to the one the
|
||||
build daemon uses.
|
||||
|
||||
To that end, the first thing to do is to use the @option{--keep-failed}
|
||||
or @option{-K} option of @command{guix build}, which will keep the
|
||||
failed build tree in @file{/tmp} or whatever directory you specified as
|
||||
@code{TMPDIR} (@pxref{Invoking guix build, @code{--keep-failed}}).
|
||||
|
||||
From there on, you can @command{cd} to the failed build tree and source
|
||||
the @file{environment-variables} file, which contains all the
|
||||
environment variable definitions that were in place when the build
|
||||
failed. So let's say you're debugging a build failure in package
|
||||
@code{foo}; a typical session would look like this:
|
||||
|
||||
@example
|
||||
$ guix build foo -K
|
||||
@dots{} @i{build fails}
|
||||
$ cd /tmp/guix-build-foo.drv-0
|
||||
$ source ./environment-variables
|
||||
$ cd foo-1.2
|
||||
@end example
|
||||
|
||||
Now, you can invoke commands as if you were the daemon (almost) and
|
||||
troubleshoot your build process.
|
||||
|
||||
Sometimes it happens that, for example, a package's tests pass when you
|
||||
run them manually but they fail when the daemon runs them. This can
|
||||
happen because the daemon runs builds in containers where, unlike in our
|
||||
environment above, network access is missing, @file{/bin/sh} does not
|
||||
exist, etc. (@pxref{Build Environment Setup}).
|
||||
|
||||
In such cases, you may need to run inspect the build process from within
|
||||
a container similar to the one the build daemon creates:
|
||||
|
||||
@example
|
||||
$ guix build -K foo
|
||||
@dots{}
|
||||
$ cd /tmp/guix-build-foo.drv-0
|
||||
$ guix environment -C foo --ad-hoc strace gdb
|
||||
[env]# source ./environment-variables
|
||||
[env]# cd foo-1.2
|
||||
@end example
|
||||
|
||||
Here, @command{guix environment -C} creates a container and spawns a new
|
||||
shell in it (@pxref{Invoking guix environment}). The @command{--ad-hoc
|
||||
strace gdb} part adds the @command{strace} and @command{gdb} commands to
|
||||
the container, which would may find handy while debugging.
|
||||
|
||||
To get closer to a container like that used by the build daemon, we can
|
||||
remove @file{/bin/sh}:
|
||||
|
||||
@example
|
||||
[env]# rm /bin/sh
|
||||
@end example
|
||||
|
||||
(Don't worry, this is harmless: this is all happening in the throw-away
|
||||
container created by @command{guix environment}.)
|
||||
|
||||
The @command{strace} command is probably not in the search path, but we
|
||||
can run:
|
||||
|
||||
@example
|
||||
[env]# $GUIX_ENVIRONMENT/bin/strace -f -o log make check
|
||||
@end example
|
||||
|
||||
In this way, not only you will have reproduced the environment variables
|
||||
the daemon uses, you will also be running the build process in a container
|
||||
similar to the one the daemon uses.
|
||||
|
||||
|
||||
@node Invoking guix edit
|
||||
@section Invoking @command{guix edit}
|
||||
|
@ -5852,7 +5938,7 @@ an upgrade. More rebuilds might be required under some circumstances.
|
|||
@example
|
||||
$ guix refresh --list-dependent flex
|
||||
Building the following 120 packages would ensure 213 dependent packages are rebuilt:
|
||||
hop-2.4.0 geiser-0.4 notmuch-0.18 mu-0.9.9.5 cflow-1.4 idutils-4.6 @dots{}
|
||||
hop@@2.4.0 geiser@@0.4 notmuch@@0.18 mu@@0.9.9.5 cflow@@1.4 idutils@@4.6 @dots{}
|
||||
@end example
|
||||
|
||||
The command above lists a set of packages that could be built to check
|
||||
|
@ -6111,7 +6197,9 @@ provides a visual representation of the DAG. By default,
|
|||
@uref{http://www.graphviz.org/, Graphviz}, so its output can be passed
|
||||
directly to the @command{dot} command of Graphviz. It can also emit an
|
||||
HTML page with embedded JavaScript code to display a ``chord diagram''
|
||||
in a Web browser, using the @uref{https://d3js.org/, d3.js} library.
|
||||
in a Web browser, using the @uref{https://d3js.org/, d3.js} library, or
|
||||
emit Cypher queries to construct a graph in a graph database supporting
|
||||
the @uref{http://www.opencypher.org/, openCypher} query language.
|
||||
The general syntax is:
|
||||
|
||||
@example
|
||||
|
@ -7118,15 +7206,15 @@ get a feel of what that means.)
|
|||
Support for the Logical Volume Manager (LVM) is missing.
|
||||
|
||||
@item
|
||||
Few system services are currently supported out-of-the-box
|
||||
(@pxref{Services}).
|
||||
More and more system services are provided (@pxref{Services}), but some
|
||||
may be missing.
|
||||
|
||||
@item
|
||||
More than 5,000 packages are available, but you may
|
||||
More than 5,300 packages are available, but you may
|
||||
occasionally find that a useful package is missing.
|
||||
|
||||
@item
|
||||
GNOME, Xfce, and Enlightenment are available (@pxref{Desktop Services}),
|
||||
GNOME, Xfce, LXDE, and Enlightenment are available (@pxref{Desktop Services}),
|
||||
as well as a number of X11 window managers. However, some graphical
|
||||
applications may be missing, as well as KDE.
|
||||
@end itemize
|
||||
|
@ -7678,7 +7766,19 @@ provides all the tools one would expect for basic user and administrator
|
|||
tasks---including the GNU Core Utilities, the GNU Networking Utilities,
|
||||
the GNU Zile lightweight text editor, @command{find}, @command{grep},
|
||||
etc. The example above adds tcpdump to those, taken from the @code{(gnu
|
||||
packages admin)} module (@pxref{Package Modules}).
|
||||
packages admin)} module (@pxref{Package Modules}). The
|
||||
@code{(list package output)} syntax can be used to add a specific output
|
||||
of a package:
|
||||
|
||||
@lisp
|
||||
(use-modules (gnu packages))
|
||||
(use-modules (gnu packages dns))
|
||||
|
||||
(operating-system
|
||||
;; ...
|
||||
(packages (cons (list bind "utils")
|
||||
%base-packages)))
|
||||
@end lisp
|
||||
|
||||
@findex specification->package
|
||||
Referring to packages by variable name, like @var{tcpdump} above, has
|
||||
|
@ -16281,9 +16381,9 @@ distribution:
|
|||
|
||||
@smallexample
|
||||
$ guix lint -c cve
|
||||
gnu/packages/base.scm:652:2: glibc-2.21: probably vulnerable to CVE-2015-1781, CVE-2015-7547
|
||||
gnu/packages/gcc.scm:334:2: gcc-4.9.3: probably vulnerable to CVE-2015-5276
|
||||
gnu/packages/image.scm:312:2: openjpeg-2.1.0: probably vulnerable to CVE-2016-1923, CVE-2016-1924
|
||||
gnu/packages/base.scm:652:2: glibc@@2.21: probably vulnerable to CVE-2015-1781, CVE-2015-7547
|
||||
gnu/packages/gcc.scm:334:2: gcc@@4.9.3: probably vulnerable to CVE-2015-5276
|
||||
gnu/packages/image.scm:312:2: openjpeg@@2.1.0: probably vulnerable to CVE-2016-1923, CVE-2016-1924
|
||||
@dots{}
|
||||
@end smallexample
|
||||
|
||||
|
|
|
@ -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/
|
||||
|
|
|
@ -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)))
|
||||
|
|
|
@ -228,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.
|
||||
|
@ -340,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)
|
||||
|
@ -348,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)
|
||||
|
|
44
gnu/local.mk
44
gnu/local.mk
|
@ -107,6 +107,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/dejagnu.scm \
|
||||
%D%/packages/dico.scm \
|
||||
%D%/packages/dictionaries.scm \
|
||||
%D%/packages/direct-connect.scm \
|
||||
%D%/packages/disk.scm \
|
||||
%D%/packages/display-managers.scm \
|
||||
%D%/packages/django.scm \
|
||||
|
@ -232,7 +233,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 +244,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 +255,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 \
|
||||
|
@ -475,6 +475,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 = \
|
||||
|
@ -483,6 +486,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 \
|
||||
|
@ -513,6 +517,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/calibre-drop-unrar.patch \
|
||||
%D%/packages/patches/calibre-no-updates-dialog.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 \
|
||||
|
@ -525,6 +530,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/coreutils-fix-cross-compilation.patch \
|
||||
%D%/packages/patches/cpio-CVE-2016-2037.patch \
|
||||
|
@ -543,6 +552,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 \
|
||||
|
@ -618,6 +628,7 @@ dist_patch_DATA = \
|
|||
%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/gobject-introspection-absolute-shlib-path.patch \
|
||||
|
@ -660,7 +671,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \
|
||||
%D%/packages/patches/hydra-disable-darcs-test.patch \
|
||||
%D%/packages/patches/icecat-avoid-bundled-libraries.patch \
|
||||
%D%/packages/patches/icecat-bug-1299500-pt10.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 \
|
||||
|
@ -719,6 +729,8 @@ dist_patch_DATA = \
|
|||
%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 \
|
||||
|
@ -726,6 +738,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 \
|
||||
|
@ -738,6 +753,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 \
|
||||
|
@ -760,8 +776,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 \
|
||||
|
@ -775,6 +797,7 @@ dist_patch_DATA = \
|
|||
%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 \
|
||||
|
@ -789,11 +812,16 @@ dist_patch_DATA = \
|
|||
%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/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 \
|
||||
|
@ -842,6 +870,7 @@ dist_patch_DATA = \
|
|||
%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 \
|
||||
|
@ -849,7 +878,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 \
|
||||
|
@ -871,6 +900,7 @@ dist_patch_DATA = \
|
|||
%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 \
|
||||
|
@ -916,7 +946,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 \
|
||||
|
@ -1085,13 +1117,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_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" \
|
||||
|
|
122
gnu/packages.scm
122
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)))
|
||||
(fold-module-public-variables (lambda (object result)
|
||||
(if (and (package? object)
|
||||
(not (hidden-package? object)))
|
||||
(proc object result)
|
||||
result))
|
||||
init
|
||||
vlist-null
|
||||
(all-package-modules))))
|
||||
(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")
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
;;; 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>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -84,14 +85,14 @@
|
|||
(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)
|
||||
|
@ -100,6 +101,7 @@
|
|||
`(("libgcrypt" ,libgcrypt)
|
||||
("libgpg-error" ,libgpg-error)
|
||||
("libmhash" ,libmhash)
|
||||
("pcre" ,pcre)
|
||||
("zlib" ,zlib)))
|
||||
(synopsis "File and directory integrity checker")
|
||||
(description
|
||||
|
@ -1352,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)
|
||||
|
@ -2087,3 +2089,94 @@ 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)))
|
||||
|
|
|
@ -1868,21 +1868,19 @@ and ALSA.")
|
|||
(define-public qjackctl
|
||||
(package
|
||||
(name "qjackctl")
|
||||
(version "0.4.4")
|
||||
(version "0.4.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append
|
||||
"mirror://sourceforge/qjackctl/qjackctl/"
|
||||
(uri (string-append "mirror://sourceforge/qjackctl/qjackctl/"
|
||||
version "/qjackctl-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"19bbljb3iz5ss4s5fmra1dxabg2fnp61sa51d63zsm56xkvv47ak"))))
|
||||
"1dsavjfzz5bpzc80mvfs940w9f9f47cf4r9cqxnaqrl4xilsa3f5"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ; no check target
|
||||
(inputs
|
||||
`(("jack-2" ,jack-2)
|
||||
`(("jack" ,jack-1)
|
||||
("qtbase" ,qtbase)
|
||||
("qtx11extras" ,qtx11extras)))
|
||||
(native-inputs
|
||||
|
@ -2475,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
|
||||
|
|
|
@ -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,8 @@ CONFIG_XFRM_STATISTICS=y
|
|||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=m
|
||||
# CONFIG_NET_KEY_MIGRATE is not set
|
||||
CONFIG_SMC=m
|
||||
CONFIG_SMC_DIAG=m
|
||||
CONFIG_INET=y
|
||||
CONFIG_IP_MULTICAST=y
|
||||
CONFIG_IP_ADVANCED_ROUTER=y
|
||||
|
@ -944,6 +965,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 +1004,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 +1098,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 +1431,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 +1541,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 +1583,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 +1831,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 +1885,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 +2057,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 +2073,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 +2162,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 +2226,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 +2420,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 +2644,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 +2658,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 +2720,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 +2760,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 +2876,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 +2897,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 +2927,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 +2943,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 +2977,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 +3119,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 +3547,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 +3597,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 +3708,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 +3758,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 +3776,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 +3824,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 +3899,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 +3950,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 +4192,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 +4209,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 +4225,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 +4296,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 +4331,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 +4363,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 +4377,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 +4537,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 +4670,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 +4997,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 +5083,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 +5147,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 +5198,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 +5564,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 +5659,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 +5700,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 +5727,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 +5747,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 +6166,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 +6178,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 +6227,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 +6258,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 +6306,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 +6574,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 +6652,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 +6680,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 +6855,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 +6957,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 +7486,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 +7552,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 +7606,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 +7625,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 +7652,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 +7704,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 +7729,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 +7806,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 +7827,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 +7929,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 +7972,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 +8051,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 +8069,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 +8095,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 +8107,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 +8178,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 +8225,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 +8646,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 +8656,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 +8664,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 +8697,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 +8711,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 +8772,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 +8795,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 +8811,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 +8845,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 +8889,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 +8911,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 +8993,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 +9052,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 +9231,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 +9257,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,8 @@ CONFIG_XFRM_STATISTICS=y
|
|||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=m
|
||||
# CONFIG_NET_KEY_MIGRATE is not set
|
||||
CONFIG_SMC=m
|
||||
CONFIG_SMC_DIAG=m
|
||||
CONFIG_INET=y
|
||||
CONFIG_IP_MULTICAST=y
|
||||
CONFIG_IP_ADVANCED_ROUTER=y
|
||||
|
@ -928,6 +949,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 +988,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 +1082,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 +1415,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 +1521,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 +1563,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 +1805,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 +1859,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 +2030,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 +2046,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 +2132,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 +2193,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 +2391,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 +2603,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 +2617,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 +2678,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 +2714,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 +2835,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 +2857,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 +2884,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 +2900,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 +2933,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 +3078,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 +3488,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 +3538,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 +3695,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 +3713,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 +3760,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 +3835,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 +3879,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 +4111,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 +4127,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 +4143,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 +4203,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 +4238,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 +4270,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 +4444,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 +4571,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 +4888,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 +4974,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 +5038,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 +5089,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 +5440,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 +5529,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 +5571,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 +5598,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 +5618,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 +5974,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 +5985,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 +6034,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 +6065,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 +6112,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 +6385,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 +6463,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 +6491,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 +6667,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 +6775,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 +6798,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 +7299,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 +7371,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 +7441,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 +7469,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 +7522,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 +7547,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 +7624,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 +7644,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 +7744,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 +7787,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 +7866,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 +7884,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 +7910,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 +7922,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 +7995,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 +8046,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 +8471,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 +8481,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 +8489,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 +8525,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 +8539,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 +8601,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 +8624,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 +8640,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 +8674,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 +8719,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 +8741,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 +8823,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 +8891,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 +9081,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 +9108,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.
|
||||
;;;
|
||||
|
@ -186,6 +187,7 @@ backups (called chunks) to allow easy burning to CD/DVD.")
|
|||
(define-public libarchive
|
||||
(package
|
||||
(name "libarchive")
|
||||
(replacement libarchive-3.3.1)
|
||||
(version "3.2.2")
|
||||
(source
|
||||
(origin
|
||||
|
@ -241,6 +243,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")
|
||||
|
|
|
@ -1140,14 +1140,14 @@ and daylight-saving rules.")
|
|||
(define-public libiconv
|
||||
(package
|
||||
(name "libiconv")
|
||||
(version "1.14")
|
||||
(version "1.15")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/libiconv/libiconv-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj"))
|
||||
"0y1ij745r4p48mxq84rax40p10ln7fc7m243p8k8sia519i3dxfc"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Work around "declared gets" error on glibc systems (fixed by
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
#:use-module (guix build-system ant)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system ocaml)
|
||||
#:use-module (guix build-system perl)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system r)
|
||||
|
@ -71,6 +72,7 @@
|
|||
#:use-module (gnu packages maths)
|
||||
#:use-module (gnu packages mpi)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages ocaml)
|
||||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages parallel)
|
||||
#:use-module (gnu packages pdf)
|
||||
|
@ -721,7 +723,7 @@ objects are made from the Sequence objects, Sequence objects have access to
|
|||
Annotation and SeqFeature objects and databases, Blast objects can be
|
||||
converted to Alignment objects, and so on. This means that the objects
|
||||
provide a coordinated and extensible framework to do computational biology.")
|
||||
(license (package-license perl)))))
|
||||
(license license:perl-license))))
|
||||
|
||||
(define-public python-biopython
|
||||
(package
|
||||
|
@ -3627,6 +3629,129 @@ interrupted by stop codons. OrfM finds and prints these ORFs.")
|
|||
(home-page "https://github.com/wwood/OrfM")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public pplacer
|
||||
(let ((commit "g807f6f3"))
|
||||
(package
|
||||
(name "pplacer")
|
||||
;; The commit should be updated with each version change.
|
||||
(version "1.1.alpha19")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/matsen/pplacer/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0z1lnd2s8sh6kpzg106wzbh2szw7h0hvq8syd5a6wv4rmyyz6x0f"))))
|
||||
(build-system ocaml-build-system)
|
||||
(arguments
|
||||
`(#:ocaml ,ocaml-4.01
|
||||
#:findlib ,ocaml4.01-findlib
|
||||
#:modules ((guix build ocaml-build-system)
|
||||
(guix build utils)
|
||||
(ice-9 ftw))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'unpack 'replace-bundled-cddlib
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let* ((cddlib-src (assoc-ref inputs "cddlib-src"))
|
||||
(local-dir "cddlib_guix"))
|
||||
(mkdir local-dir)
|
||||
(with-directory-excursion local-dir
|
||||
(system* "tar" "xvf" cddlib-src))
|
||||
(let ((cddlib-src-folder
|
||||
(string-append local-dir "/"
|
||||
(list-ref (scandir local-dir) 2)
|
||||
"/lib-src")))
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(copy-file file
|
||||
(string-append "cdd_src/" (basename file))))
|
||||
(find-files cddlib-src-folder ".*[ch]$")))
|
||||
#t)))
|
||||
(add-after 'unpack 'fix-makefile
|
||||
(lambda _
|
||||
;; Remove system calls to 'git'.
|
||||
(substitute* "Makefile"
|
||||
(("^DESCRIPT:=pplacer-.*")
|
||||
(string-append
|
||||
"DESCRIPT:=pplacer-$(shell uname)-v" ,version "\n")))
|
||||
(substitute* "myocamlbuild.ml"
|
||||
(("git describe --tags --long .*\\\" with")
|
||||
(string-append
|
||||
"echo -n v" ,version "-" ,commit "\" with")))
|
||||
#t))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin")))
|
||||
(copy-recursively "bin" bin))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("zlib" ,zlib)
|
||||
("gsl" ,gsl)
|
||||
("ocaml-ounit" ,ocaml4.01-ounit)
|
||||
("ocaml-batteries" ,ocaml4.01-batteries)
|
||||
("ocaml-camlzip" ,ocaml4.01-camlzip)
|
||||
("ocaml-csv" ,ocaml4.01-csv)
|
||||
("ocaml-sqlite3" ,ocaml4.01-sqlite3)
|
||||
("ocaml-xmlm" ,ocaml4.01-xmlm)
|
||||
("ocaml-mcl" ,ocaml4.01-mcl)
|
||||
("ocaml-gsl" ,ocaml4.01-gsl)
|
||||
("cddlib-src" ,(package-source cddlib))))
|
||||
(propagated-inputs
|
||||
`(("pplacer-scripts" ,pplacer-scripts)))
|
||||
(synopsis "Phylogenetic placement of biological sequences")
|
||||
(description
|
||||
"Pplacer places query sequences on a fixed reference phylogenetic tree
|
||||
to maximize phylogenetic likelihood or posterior probability according to a
|
||||
reference alignment. Pplacer is designed to be fast, to give useful
|
||||
information about uncertainty, and to offer advanced visualization and
|
||||
downstream analysis.")
|
||||
(home-page "http://matsen.fhcrc.org/pplacer")
|
||||
(license license:gpl3))))
|
||||
|
||||
;; This package is installed alongside 'pplacer'. It is a separate package so
|
||||
;; that it can use the python-build-system for the scripts that are
|
||||
;; distributed alongside the main OCaml binaries.
|
||||
(define pplacer-scripts
|
||||
(package
|
||||
(inherit pplacer)
|
||||
(name "pplacer-scripts")
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:python ,python-2
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'enter-scripts-dir
|
||||
(lambda _ (chdir "scripts")))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(zero? (system* "python" "-m" "unittest" "discover" "-v"))))
|
||||
(add-after 'install 'wrap-executables
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin")))
|
||||
(let ((path (string-append
|
||||
(assoc-ref inputs "hmmer") "/bin:"
|
||||
(assoc-ref inputs "infernal") "/bin")))
|
||||
(display path)
|
||||
(wrap-program (string-append bin "/refpkg_align.py")
|
||||
`("PATH" ":" prefix (,path))))
|
||||
(let ((path (string-append
|
||||
(assoc-ref inputs "hmmer") "/bin")))
|
||||
(wrap-program (string-append bin "/hrefpkg_query.py")
|
||||
`("PATH" ":" prefix (,path)))))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("infernal" ,infernal)
|
||||
("hmmer" ,hmmer)))
|
||||
(propagated-inputs
|
||||
`(("python-biopython" ,python2-biopython)
|
||||
("taxtastic" ,taxtastic)))
|
||||
(synopsis "Pplacer Python scripts")))
|
||||
|
||||
(define-public python2-pbcore
|
||||
(package
|
||||
(name "python2-pbcore")
|
||||
|
@ -5268,6 +5393,42 @@ between experiments, StringTie's output can be processed either by the
|
|||
Cuffdiff or Ballgown programs.")
|
||||
(license license:artistic2.0)))
|
||||
|
||||
(define-public taxtastic
|
||||
(package
|
||||
(name "taxtastic")
|
||||
(version "0.5.7")
|
||||
;; Versions after 0.5.4 do not appear to be distributed on PyPI so we
|
||||
;; download the package from GitHub.
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/fhcrc/taxtastic/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1s0h5y1lds1c40jhir5585ffm6yjyn8h5aqimpgv64rhqhfv56xx"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:python ,python-2
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(zero? (system* "python" "-m" "unittest" "discover" "-v")))))))
|
||||
(propagated-inputs
|
||||
`(("python-sqlalchemy" ,python2-sqlalchemy)
|
||||
("python-decorator" ,python2-decorator)
|
||||
("python-biopython" ,python2-biopython)
|
||||
("python-pandas" ,python2-pandas)))
|
||||
(home-page "https://github.com/fhcrc/taxtastic")
|
||||
(synopsis "Tools for taxonomic naming and annotation")
|
||||
(description
|
||||
"Taxtastic is software written in python used to build and maintain
|
||||
reference packages i.e. collections of reference trees, reference alignments,
|
||||
profiles, and associated taxonomic information.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public vcftools
|
||||
(package
|
||||
(name "vcftools")
|
||||
|
@ -7730,7 +7891,7 @@ library implementing most of the pipeline's features.")
|
|||
`(("r-minimal" ,r-minimal)
|
||||
("r-rcas" ,r-rcas)
|
||||
("guile-next" ,guile-2.2)
|
||||
("guile-json" ,guile2.2-json)
|
||||
("guile-json" ,guile-json)
|
||||
("guile-redis" ,guile2.2-redis)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -69,7 +69,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
|
|||
(define-public meson
|
||||
(package
|
||||
(name "meson")
|
||||
(version "0.39.1")
|
||||
(version "0.40.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/mesonbuild/meson/"
|
||||
|
@ -77,7 +77,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jwgd6sl7zl7h16id3405gwk6vlkk86ggwrp0k47njwkxmryq8d4"))))
|
||||
"0yl6iryh89nn6hzhwv7kg16ki1chh9h0x1yk1y130h87iq42a35r"))))
|
||||
(build-system python-build-system)
|
||||
(inputs `(("ninja", ninja)))
|
||||
(home-page "https://mesonbuild.com/")
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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+))))
|
||||
|
|
|
@ -1025,4 +1025,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
|
||||
|
|
|
@ -611,7 +611,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
|
||||
|
@ -646,7 +646,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
|
||||
|
@ -668,7 +668,7 @@ 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
|
||||
|
@ -1180,7 +1180,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"
|
||||
|
@ -1188,7 +1188,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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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,9 +45,8 @@
|
|||
;; Delay to avoid module circularity problems.
|
||||
(define ghostscript/cups
|
||||
(delay
|
||||
(package (inherit ghostscript)
|
||||
(package/inherit ghostscript
|
||||
(name "ghostscript-with-cups")
|
||||
(replacement #f)
|
||||
(inputs `(("cups" ,cups-minimal)
|
||||
,@(package-inputs ghostscript))))))
|
||||
|
||||
|
|
|
@ -372,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/"
|
||||
|
@ -380,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"
|
||||
|
@ -440,14 +449,14 @@ as a drop-in replacement of MySQL.")
|
|||
(define-public postgresql
|
||||
(package
|
||||
(name "postgresql")
|
||||
(version "9.6.2")
|
||||
(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
|
||||
"1jahzqqw5inyvmacic2ihhj5f8z50lapci2fwws91h719ccbb1q1"))))
|
||||
"1imrjp4vfslxj5rrvphcrrk21zv8kqw3gacmwradixh1d5rv6i8n"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -577,9 +586,15 @@ types are supported, as is encryption.")
|
|||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:make-flags (list "CC=gcc"
|
||||
`(#: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
|
||||
|
@ -592,6 +607,13 @@ types are supported, as is encryption.")
|
|||
(("#!/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"
|
||||
|
@ -608,8 +630,6 @@ types are supported, as is encryption.")
|
|||
;; targets for release builds 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.
|
||||
(setenv "PORTABLE" "1")
|
||||
(zero? (apply system* "make" "shared_lib" make-flags)))))))
|
||||
(native-inputs
|
||||
`(("parallel" ,parallel)
|
||||
|
@ -790,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
|
||||
|
@ -844,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
|
||||
|
@ -869,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
|
||||
|
@ -894,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
|
||||
|
@ -949,7 +969,7 @@ 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
|
||||
|
@ -973,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
|
||||
|
@ -997,7 +1017,7 @@ 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
|
||||
|
@ -1019,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
|
||||
|
@ -1052,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
|
||||
|
@ -1078,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
|
||||
|
@ -1098,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
|
||||
|
@ -1301,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
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#: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
|
||||
|
@ -128,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?
|
||||
|
@ -143,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)
|
||||
|
@ -245,3 +246,451 @@ templatetags and a full test suite.")
|
|||
|
||||
(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.
|
||||
;;;
|
||||
|
@ -90,7 +91,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
|
|||
(define-public bind
|
||||
(package
|
||||
(name "bind")
|
||||
(version "9.10.4-P8")
|
||||
(version "9.11.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -98,7 +99,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1sv6fp5gznjj1kmx9q8wr2c6js10wqckgy25sqj83bbf8smmdlvx"))))
|
||||
"1chhphaa4lmfxj9daqsxph5ng4h3qq51jx21rj2i6an8ynah0192"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs `("out" "utils"))
|
||||
(inputs
|
||||
|
@ -149,12 +150,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 +163,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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2017 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;; Copyright © 2015, 2016 Christopher Allan Webber <cwebber@dustycloud.org>
|
||||
;;; Copyright © 2016 humanitiesNerd <catonano@gmail.com>
|
||||
;;; Copyright © 2016 Adriano Peluso <catonano@gmail.com>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
|
||||
|
@ -92,7 +92,8 @@
|
|||
#:use-module (gnu packages gd)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (srfi srfi-1))
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (ice-9 match))
|
||||
|
||||
(define-public emacs
|
||||
(package
|
||||
|
@ -890,14 +891,14 @@ provides an optional IDE-like error list.")
|
|||
(define-public emms
|
||||
(package
|
||||
(name "emacs-emms")
|
||||
(version "4.2")
|
||||
(version "4.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/emms/emms-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xa9y64g5z8gfnxk1c2rf3plfjhqn4r6j8dpiygnfs6w4giysn22"))
|
||||
"0dicgkl8l83n4cah5vk7c242abbwpyzlih451blgw37f3rijs480"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(substitute* "Makefile"
|
||||
|
@ -1125,13 +1126,6 @@ than @code{electric-indent-mode}.")
|
|||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'install 'patch-exec-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(emacs-substitute-variables "ag.el"
|
||||
("ag-executable"
|
||||
(string-append (assoc-ref inputs "the-silver-searcher")
|
||||
"/bin/ag")))
|
||||
#t))
|
||||
(add-before 'install 'make-info
|
||||
(lambda _
|
||||
(with-directory-excursion "docs"
|
||||
|
@ -1142,14 +1136,14 @@ than @code{electric-indent-mode}.")
|
|||
(info (string-append out "/share/info")))
|
||||
(install-file "docs/_build/texinfo/agel.info" info)
|
||||
#t))))))
|
||||
(inputs
|
||||
`(("the-silver-searcher" ,the-silver-searcher)))
|
||||
(native-inputs
|
||||
`(("python-sphinx" ,python-sphinx)
|
||||
("texinfo" ,texinfo)))
|
||||
(propagated-inputs
|
||||
`(("dash" ,emacs-dash)
|
||||
("s" ,emacs-s)))
|
||||
("s" ,emacs-s)
|
||||
;; We need to use 'ag' as the executable on remote systems.
|
||||
("the-silver-searcher" ,the-silver-searcher)))
|
||||
(home-page "https://github.com/Wilfred/ag.el")
|
||||
(synopsis "Front-end for ag (the-silver-searcher) for Emacs")
|
||||
(description "This package provides the ability to use the silver
|
||||
|
@ -1406,7 +1400,7 @@ type, for example: packages, buffers, files, etc.")
|
|||
(define-public emacs-guix
|
||||
(package
|
||||
(name "emacs-guix")
|
||||
(version "0.3")
|
||||
(version "0.3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/alezost/guix.el"
|
||||
|
@ -1414,7 +1408,7 @@ type, for example: packages, buffers, files, etc.")
|
|||
"/emacs-guix-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1327zp140c7acckk0ajl88cgwr0lk9j3mb67nsq2janxrkwmj6br"))))
|
||||
"0s7s90rfba8ccbilbvmbcwn4qp4m0jv9y58xq8avm39cygmjgyxz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -1446,14 +1440,14 @@ type, for example: packages, buffers, files, etc.")
|
|||
`(("pkg-config" ,pkg-config)
|
||||
("emacs" ,emacs-minimal)))
|
||||
(inputs
|
||||
`(("guile" ,guile-2.0)
|
||||
`(("guile" ,guile-2.2)
|
||||
("guix" ,guix)))
|
||||
(propagated-inputs
|
||||
`(("geiser" ,geiser)
|
||||
("dash" ,emacs-dash)
|
||||
("bui" ,emacs-bui)
|
||||
("magit-popup" ,emacs-magit-popup)))
|
||||
(home-page "https://github.com/alezost/guix.el")
|
||||
(home-page "https://alezost.github.io/guix.el/")
|
||||
(synopsis "Emacs interface for GNU Guix")
|
||||
(description
|
||||
"Emacs-Guix provides a visual interface, tools and features for the GNU
|
||||
|
@ -2584,7 +2578,7 @@ dark background.")
|
|||
(define-public emacs-smartparens
|
||||
(package
|
||||
(name "emacs-smartparens")
|
||||
(version "1.9.0")
|
||||
(version "1.10.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -2593,7 +2587,7 @@ dark background.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12065r7h1s9v8lnq5mk3654dkw4cq60ky8aniqq5n2ivv6qd2d4q"))))
|
||||
"1nwsi6fbbxjq3r22r6knmx71la3g0lmwfb95i9q4k138gn0m2l3i"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs `(("emacs-dash" ,emacs-dash)))
|
||||
(home-page "https://github.com/Fuco1/smartparens")
|
||||
|
@ -2882,6 +2876,16 @@ S-expression.")
|
|||
(base32
|
||||
"117mvjqh4nm8mvmwmmvy4qmkdg23ldlzk08y91g8b8ac8kxwqg81"))))
|
||||
(build-system emacs-build-system)
|
||||
(native-inputs
|
||||
`(("emacs-dash" ,emacs-dash)
|
||||
("emacs-s" ,emacs-s)
|
||||
("ert-runner" ,ert-runner)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'check
|
||||
(lambda _
|
||||
(zero? (system* "ert-runner")))))))
|
||||
(home-page "https://github.com/clojure-emacs/clojure-mode")
|
||||
(synopsis "Major mode for Clojure code")
|
||||
(description
|
||||
|
@ -3495,6 +3499,7 @@ extensions.")
|
|||
(method url-fetch)
|
||||
;; There is no versioned source.
|
||||
(uri "https://www.emacswiki.org/emacs/download/goto-chg.el")
|
||||
(file-name (string-append "goto-chg-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij"))))
|
||||
|
@ -3574,14 +3579,14 @@ passive voice.")
|
|||
(define-public emacs-org
|
||||
(package
|
||||
(name "emacs-org")
|
||||
(version "20170210")
|
||||
(version "20170502")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://elpa.gnu.org/packages/org-"
|
||||
version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"15415wh3w8d4c8hd7qfrfdjnjb1zppmrkg8cdp7hw2ilyr90c0bn"))))
|
||||
"12inz804j55ycprb2m3ay54d1bhwhjssmn5nrfm7cfklyhfsy27s"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://orgmode.org/")
|
||||
(synopsis "Outline-based notes management and organizer")
|
||||
|
@ -4519,3 +4524,246 @@ It should enable you to implement low-level X11 applications.")
|
|||
(description "EXWM is a full-featured tiling X window manager for Emacs
|
||||
built on top of XELB.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-gnuplot
|
||||
(package
|
||||
(name "emacs-gnuplot")
|
||||
(version "0.7.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/bruceravel/gnuplot-mode/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0glzymrn138lwig7p4cj17x4if5jisr6l4g6wcbxisqkqgc1h01i"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("emacs" ,emacs-minimal)))
|
||||
(arguments
|
||||
(let ((elisp-dir (string-append "/share/emacs/site-lisp/guix.d"
|
||||
"/gnuplot-" version)))
|
||||
`(#:modules ((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(guix build emacs-utils))
|
||||
#:imported-modules (,@%gnu-build-system-modules
|
||||
(guix build emacs-utils))
|
||||
#:configure-flags
|
||||
(list (string-append "EMACS=" (assoc-ref %build-inputs "emacs")
|
||||
"/bin/emacs")
|
||||
(string-append "--with-lispdir=" %output ,elisp-dir))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'generate-autoloads
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(emacs-generate-autoloads
|
||||
"gnuplot"
|
||||
(string-append (assoc-ref outputs "out") ,elisp-dir))
|
||||
#t))))))
|
||||
(home-page "https://github.com/bruceravel/gnuplot-mode")
|
||||
(synopsis "Emacs major mode for interacting with gnuplot")
|
||||
(description "@code{emacs-gnuplot} is an emacs major mode for interacting
|
||||
with gnuplot.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public emacs-transpose-frame
|
||||
(package
|
||||
(name "emacs-transpose-frame")
|
||||
(version "0.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri "http://www.emacswiki.org/emacs/download/transpose-frame.el")
|
||||
(file-name (string-append "transpose-frame-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://www.emacswiki.org/emacs/TransposeFrame")
|
||||
(synopsis "Transpose window arrangement in current frame")
|
||||
(description "@code{emacs-transpose-frame} provides some interactive
|
||||
functions which allows users to transpose windows arrangement in currently
|
||||
selected frame.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public emacs-key-chord
|
||||
(package
|
||||
(name "emacs-key-chord")
|
||||
(version "0.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri "https://www.emacswiki.org/emacs/download/key-chord.el")
|
||||
(file-name (string-append "key-chord-" version ".el"))
|
||||
(sha256
|
||||
(base32
|
||||
"03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://www.emacswiki.org/emacs/key-chord.el")
|
||||
(synopsis "Map pairs of simultaneously pressed keys to Emacs commands")
|
||||
(description "@code{emacs-key-chord} provides @code{key-chord-mode}, a
|
||||
mode for binding key chords to commands. A key chord is defined as two keys
|
||||
pressed simultaneously or a single key quickly pressed twice.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public emacs-evil-surround
|
||||
(package
|
||||
(name "emacs-evil-surround")
|
||||
(version "1.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/timcharper/evil-surround/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0p572jgic3q1ia1nz37kclir729ay6i2f4sa7wnaapyxly2lwb3r"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-evil" ,emacs-evil)))
|
||||
(home-page "https://github.com/timcharper/evil-surround")
|
||||
(synopsis "Easily modify surrounding parantheses and quotes")
|
||||
(description "@code{emacs-evil-surround} allows easy deletion, change and
|
||||
addition of surrounding pairs, such as parantheses and quotes, in evil mode.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-evil-commentary
|
||||
(package
|
||||
(name "emacs-evil-commentary")
|
||||
(version "2.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/linktohack/evil-commentary/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jdya0i921nwskwrzdsj0vrr3m7gm49dy6f6pk9p5nxaarfxk230"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-evil" ,emacs-evil)))
|
||||
(home-page "https://github.com/linktohack/evil-commentary")
|
||||
(synopsis "Comment out code in evil mode")
|
||||
(description "@code{emacs-evil-commentary} adds keybindings to easily
|
||||
comment out lines of code in evil mode. It provides @code{gcc} to comment out
|
||||
lines, and @code{gc} to comment out the target of a motion.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
;; Tests for emacs-ansi have a circular dependency with ert-runner, and
|
||||
;; therefore cannot be run
|
||||
(define-public emacs-ansi
|
||||
(package
|
||||
(name "emacs-ansi")
|
||||
(version "0.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/rejeep/ansi.el/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"13jj4vbi98j3p17hs99bmy7g21jd5h4v3wpxk4pkvhylm3bfwjw8"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-dash" ,emacs-dash)
|
||||
("emacs-s" ,emacs-s)))
|
||||
(home-page "https://github.com/rejeep/ansi.el")
|
||||
(synopsis "Convert strings to ANSI")
|
||||
(description "@code{emacs-ansi} defines functions that turns simple
|
||||
strings to ANSI strings. Turning a string into an ANSI string can be to add
|
||||
color to a text, add color in the background of a text or adding a style, such
|
||||
as bold, underscore or italic.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
;; Tests for emacs-commander have a circular dependency with ert-runner, and
|
||||
;; therefore cannot be run
|
||||
(define-public emacs-commander
|
||||
(package
|
||||
(name "emacs-commander")
|
||||
(version "0.7.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/rejeep/commander.el/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"196s2i15z7gwxa97l1wkxvjnfmj5n38wwm6d3g4zz15l2vqggc2y"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-dash" ,emacs-dash)
|
||||
("emacs-f" ,emacs-f)
|
||||
("emacs-s" ,emacs-s)))
|
||||
(home-page "https://github.com/rejeep/commander.el")
|
||||
(synopsis "Emacs command line parser")
|
||||
(description "@code{emacs-commander} provides command line parsing for
|
||||
Emacs.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
;; Tests for ert-runner have a circular dependency with ecukes, and therefore
|
||||
;; cannot be run
|
||||
(define-public ert-runner
|
||||
(let ((dependencies
|
||||
`(("emacs-ansi" ,emacs-ansi)
|
||||
("emacs-commander" ,emacs-commander)
|
||||
("emacs-dash" ,emacs-dash)
|
||||
("emacs-f" ,emacs-f)
|
||||
("emacs-s" ,emacs-s)
|
||||
("emacs-shut-up" ,emacs-shut-up))))
|
||||
(package
|
||||
(name "ert-runner")
|
||||
(version "0.7.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/rejeep/ert-runner.el/archive/v"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1657nck9i96a4xgl8crfqq0s8gflzp21pkkzwg6m3z5npjxklgwp"))))
|
||||
(build-system emacs-build-system)
|
||||
(inputs dependencies)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'install-executable
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(substitute* "bin/ert-runner"
|
||||
(("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)")
|
||||
(string-append "ERT_RUNNER=\"" out
|
||||
"/share/emacs/site-lisp/guix.d/"
|
||||
,name "-" ,version)))
|
||||
(install-file "bin/ert-runner" (string-append out "/bin"))
|
||||
(wrap-program (string-append out "/bin/ert-runner")
|
||||
(list "EMACSLOADPATH" ":" '=
|
||||
(append
|
||||
,(match dependencies
|
||||
(((labels packages) ...)
|
||||
`(map (lambda (label package version)
|
||||
(string-append (assoc-ref inputs label)
|
||||
"/share/emacs/site-lisp/guix.d/"
|
||||
(string-drop package 6)
|
||||
"-" version))
|
||||
',labels
|
||||
',(map package-name packages)
|
||||
',(map package-version packages))))
|
||||
;; empty element to include the default load path as
|
||||
;; determined by emacs' standard initialization
|
||||
;; procedure
|
||||
(list ""))))
|
||||
#t))))))
|
||||
(home-page "https://github.com/rejeep/ert-runner.el")
|
||||
(synopsis "Opinionated Ert testing workflow")
|
||||
(description "@code{ert-runner} is a tool for Emacs projects tested
|
||||
using ERT. It assumes a certain test structure setup and can therefore make
|
||||
running tests easier.")
|
||||
(license license:gpl3+))))
|
||||
|
|
|
@ -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)
|
||||
|
@ -173,15 +174,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 +200,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 +222,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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
@ -518,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")
|
||||
|
|
|
@ -187,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")
|
||||
|
|
|
@ -28,6 +28,8 @@
|
|||
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 nee <nee-git@hidamari.blue>
|
||||
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -52,6 +54,7 @@
|
|||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix svn-download)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages algebra)
|
||||
#:use-module (gnu packages autotools)
|
||||
|
@ -88,6 +91,7 @@
|
|||
#:use-module (gnu packages ocaml)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages textutils)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages databases)
|
||||
|
@ -120,6 +124,10 @@
|
|||
#:use-module (gnu packages wxwidgets)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages cmake)
|
||||
#:use-module (gnu packages gnuzilla)
|
||||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages networking)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system haskell)
|
||||
#:use-module (guix build-system python)
|
||||
|
@ -2687,6 +2695,69 @@ your way through an underground cave system in search of the Grue. Can you
|
|||
capture it and get out alive?")
|
||||
(license license:agpl3+)))
|
||||
|
||||
(define-public lierolibre
|
||||
(package
|
||||
(name "lierolibre")
|
||||
(version "0.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://launchpad.net/lierolibre/trunk/"
|
||||
version "/+download/lierolibre-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1cf1gvsn4qq190lrf9k5bpjnqwlcfw7pajvdnh7z5r4jqw0rsbl9"))
|
||||
(patches
|
||||
(search-patches "lierolibre-check-unaligned-access.patch"
|
||||
"lierolibre-try-building-other-arch.patch"
|
||||
"lierolibre-remove-arch-warning.patch"
|
||||
"lierolibre-newer-libconfig.patch"
|
||||
"lierolibre-is-free-software.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Delete pre-compiled files.
|
||||
(delete-file "data/LIERO.CHR")
|
||||
(delete-file "data/LIERO.SND")
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("imagemagick" ,imagemagick)
|
||||
("pkg-config" ,pkg-config)
|
||||
("util-linux" ,util-linux)
|
||||
("sox" ,sox)))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("libconfig" ,libconfig)
|
||||
("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer)))
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://gitlab.com/lierolibre/lierolibre")
|
||||
(synopsis "Old-school earthworm action game")
|
||||
(description
|
||||
"lierolibre is an earthworm action game where you fight another player
|
||||
(or the computer) underground using a wide array of weapons.
|
||||
|
||||
Features:
|
||||
@itemize
|
||||
@item 2 worms, 40 weapons, great playability, two game modes: Kill'em All
|
||||
and Game of Tag, plus AI-players without true intelligence!
|
||||
@item Dat nostalgia.
|
||||
@item Extensions via a hidden F1 menu:
|
||||
@itemize
|
||||
@item Replays
|
||||
@item Game controller support
|
||||
@item Powerlevel palettes
|
||||
@end itemize
|
||||
@item Ability to write game variables to plain text files.
|
||||
@item Ability to load game variables from both EXE and plain text files.
|
||||
@item Scripts to extract and repack graphics, sounds and levels.
|
||||
@end itemize
|
||||
|
||||
To switch between different window sizes, use F6, F7 and F8, to switch to
|
||||
fullscreen, use F5 or Alt+Enter.")
|
||||
;; Code mainly BSD-2, some parts under Boost 1.0. All assets are WTFPL2.
|
||||
(license (list license:bsd-2 license:boost1.0 license:wtfpl2))))
|
||||
|
||||
(define-public warzone2100
|
||||
(package
|
||||
(name "warzone2100")
|
||||
|
@ -3941,3 +4012,224 @@ fabulous Orb of Zot.")
|
|||
license:expat
|
||||
license:zlib
|
||||
license:asl2.0))))
|
||||
|
||||
(define-public lugaru
|
||||
(package
|
||||
(name "lugaru")
|
||||
(version "1.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://bitbucket.org/osslugaru/lugaru/downloads/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"15zgcshy22q51rm72zi6y9z7qlgnz5iw3gczjdlir4bqmxy4gspk"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list "-DSYSTEM_INSTALL=ON")
|
||||
;; no test target
|
||||
#:tests? #f))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("sdl2" ,sdl2)
|
||||
("glu" ,glu)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("openal" ,openal)
|
||||
("vorbis" ,libvorbis)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://osslugaru.gitlab.io")
|
||||
(synopsis "Cross-platform third-person action game")
|
||||
(description "Lugaru is a third-person action game. The main character,
|
||||
Turner, is an anthropomorphic rebel bunny rabbit with impressive combat skills.
|
||||
In his quest to find those responsible for slaughtering his village, he uncovers
|
||||
a far-reaching conspiracy involving the corrupt leaders of the rabbit republic
|
||||
and the starving wolves from a nearby den. Turner takes it upon himself to
|
||||
fight against their plot and save his fellow rabbits from slavery.")
|
||||
(license (list license:gpl2+ ; code
|
||||
;; assets:
|
||||
license:cc-by-sa3.0
|
||||
license:cc-by-sa4.0))))
|
||||
|
||||
(define-public 0ad-data
|
||||
(package
|
||||
(name "0ad-data")
|
||||
(version "0.0.21-alpha")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://releases.wildfiregames.com/0ad-"
|
||||
version "-unix-data.tar.xz"))
|
||||
(file-name (string-append name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"15xadyrpvq27lm9p1ny7bcmmv56m16h3xadbkdx69gfkzxc3razk"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
#~(begin
|
||||
(for-each
|
||||
(lambda (name)
|
||||
(let* ((dir (string-append "binaries/data/mods/" name))
|
||||
(file (string-append dir "/" name ".zip"))
|
||||
(unzip #$(file-append unzip "/bin/unzip")))
|
||||
(system* unzip "-d" dir file)
|
||||
(delete-file file)))
|
||||
'("mod" "public"))
|
||||
#t))))
|
||||
(build-system trivial-build-system)
|
||||
(native-inputs `(("tar" ,tar)
|
||||
("xz" ,xz)))
|
||||
(arguments
|
||||
`(#:modules ((guix build utils))
|
||||
#:builder
|
||||
(begin
|
||||
(use-modules (guix build utils))
|
||||
(let ((out (assoc-ref %outputs "out"))
|
||||
(source (assoc-ref %build-inputs "source"))
|
||||
(tar (string-append (assoc-ref %build-inputs "tar") "/bin/tar"))
|
||||
(xz-path (string-append (assoc-ref %build-inputs "xz") "/bin")))
|
||||
(setenv "PATH" xz-path)
|
||||
(mkdir out)
|
||||
(zero? (system* tar "xvf" source "-C" out "--strip=3"))))))
|
||||
(synopsis "Data files for 0ad")
|
||||
(description "0ad-data provides the data files required by the game 0ad.")
|
||||
(home-page "https://play0ad.com")
|
||||
(license (list (license:fsdg-compatible
|
||||
"http://tavmjong.free.fr/FONTS/ArevCopyright.txt"
|
||||
(license:license-comment
|
||||
(package-license font-bitstream-vera)))
|
||||
(package-license font-bitstream-vera)
|
||||
license:cc-by-sa3.0
|
||||
license:expat
|
||||
license:gfl1.0
|
||||
license:gpl2+
|
||||
license:gpl3+))))
|
||||
|
||||
(define-public 0ad
|
||||
(package
|
||||
(name "0ad")
|
||||
(version "0.0.21-alpha")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://releases.wildfiregames.com/0ad-"
|
||||
version "-unix-build.tar.xz"))
|
||||
(file-name (string-append name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kw3hqnr737ipx4f03khz3hvsh3ha7r8iy9njppk2faa53j27gln"))
|
||||
;; A snippet here would cause a build failure because of timestamps
|
||||
;; reset. See https://bugs.gnu.org/26734.
|
||||
))
|
||||
(inputs
|
||||
`(("0ad-data" ,0ad-data)
|
||||
("curl" ,curl)
|
||||
("enet" ,enet)
|
||||
("gloox" ,gloox)
|
||||
("icu4c" ,icu4c)
|
||||
("libpng" ,libpng)
|
||||
("libvorbis" ,libvorbis)
|
||||
("libxcursor" ,libxcursor)
|
||||
("libxml2" ,libxml2)
|
||||
("miniupnpc" ,miniupnpc)
|
||||
("mozjs-38" ,mozjs-38)
|
||||
("openal" ,openal)
|
||||
("sdl2" ,sdl2)
|
||||
("wxwidgets" ,wxwidgets)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("boost" ,boost)
|
||||
("cmake" ,cmake)
|
||||
("mesa" ,mesa)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python-2" ,python-2)))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'delete-bundles
|
||||
(lambda _
|
||||
(delete-file-recursively "libraries/source/spidermonkey")
|
||||
#t))
|
||||
(add-after 'unpack 'fix-x11-includes
|
||||
(lambda _
|
||||
(substitute* "source/lib/sysdep/os/unix/x/x.cpp"
|
||||
(("<Xlib.h>") "<X11/Xlib.h>"))
|
||||
(substitute* "source/lib/sysdep/os/unix/x/x.cpp"
|
||||
(("<Xatom.h>") "<X11/Xatom.h>"))
|
||||
(substitute* "source/lib/sysdep/os/unix/x/x.cpp"
|
||||
(("<Xcursor/Xcursor.h>") "<X11/Xcursor/Xcursor.h>"))
|
||||
#t))
|
||||
(replace 'configure
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((jobs (number->string (parallel-job-count)))
|
||||
(out (assoc-ref outputs "out"))
|
||||
(lib (string-append out "/lib"))
|
||||
(data (string-append out "/share/0ad")))
|
||||
(setenv "JOBS" (string-append "-j" jobs))
|
||||
(setenv "CC" "gcc")
|
||||
(with-directory-excursion "build/workspaces"
|
||||
(zero? (system* "./update-workspaces.sh"
|
||||
(string-append "--libdir=" lib)
|
||||
(string-append "--datadir=" data)
|
||||
"--minimal-flags"
|
||||
;; TODO: "--with-system-nvtt"
|
||||
"--with-system-mozjs38"))))))
|
||||
(add-before 'build 'chdir
|
||||
(lambda _
|
||||
(chdir "build/workspaces/gcc")
|
||||
#t))
|
||||
(delete 'check)
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(chdir "../../../binaries")
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
(lib (string-append out "/lib"))
|
||||
(data (string-append out "/share/0ad"))
|
||||
(applications (string-append out "/share/applications"))
|
||||
(pixmaps (string-append out "/share/pixmaps"))
|
||||
(0ad-data (assoc-ref inputs "0ad-data")))
|
||||
;; data
|
||||
(copy-recursively "data" data)
|
||||
(for-each (lambda (file)
|
||||
(symlink (string-append 0ad-data "/" file)
|
||||
(string-append data "/" file)))
|
||||
'("config" "mods/mod" "mods/public" "tools"))
|
||||
;; libraries
|
||||
(for-each (lambda (file)
|
||||
(install-file file lib))
|
||||
(find-files "system" "\\.so$"))
|
||||
;; binaries
|
||||
(install-file "system/pyrogenesis" bin)
|
||||
(with-directory-excursion bin
|
||||
(symlink "pyrogenesis" "0ad"))
|
||||
;; resources
|
||||
(with-directory-excursion "../build/resources"
|
||||
(install-file "0ad.desktop" applications)
|
||||
(install-file "0ad.png" pixmaps))
|
||||
#t)))
|
||||
(add-after 'install 'check
|
||||
(lambda _
|
||||
(with-directory-excursion "system"
|
||||
(zero? (system* "./test"))))))))
|
||||
(home-page "https://play0ad.com")
|
||||
(synopsis "3D real-time strategy game of ancient warfare")
|
||||
(description "0 A.D. is a real-time strategy (RTS) game of ancient
|
||||
warfare. It's a historically-based war/economy game that allows players to
|
||||
relive or rewrite the history of twelve ancient civilizations, each depicted
|
||||
at their peak of economic growth and military prowess.
|
||||
|
||||
0ad needs a window manager that supports 'Extended Window Manager Hints'.")
|
||||
(license (list license:bsd-2
|
||||
license:bsd-3
|
||||
license:expat
|
||||
license:gpl2+
|
||||
license:ibmpl1.0
|
||||
license:isc
|
||||
license:lgpl2.1
|
||||
license:lgpl3
|
||||
license:mpl2.0
|
||||
license:zlib))))
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
@ -209,8 +209,7 @@ output file formats and printers.")
|
|||
(properties '((upstream-name . "gnu-ghostscript")))))
|
||||
|
||||
(define-public ghostscript/x
|
||||
(package (inherit ghostscript)
|
||||
(replacement #f)
|
||||
(package/inherit ghostscript
|
||||
(name (string-append (package-name ghostscript) "-with-x"))
|
||||
(inputs `(("libxext" ,libxext)
|
||||
("libxt" ,libxt)
|
||||
|
@ -219,6 +218,7 @@ output file formats and printers.")
|
|||
(define ghostscript/fixed
|
||||
(package
|
||||
(inherit ghostscript)
|
||||
(replacement #f)
|
||||
(source
|
||||
(origin
|
||||
(inherit (package-source ghostscript))
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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>
|
||||
|
@ -150,7 +150,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
|
||||
|
@ -159,7 +166,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)
|
||||
|
@ -4995,6 +5003,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"))))
|
||||
|
|
|
@ -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.
|
||||
;;;
|
||||
|
@ -23,7 +23,9 @@
|
|||
#: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)
|
||||
|
@ -31,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
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
;;; 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.
|
||||
;;;
|
||||
|
@ -57,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
|
||||
|
@ -159,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")
|
||||
|
@ -323,7 +411,7 @@ standards.")
|
|||
(define-public icecat
|
||||
(package
|
||||
(name "icecat")
|
||||
(version "52.0.2-gnu1")
|
||||
(version "52.1.0-gnu1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -332,162 +420,38 @@ standards.")
|
|||
"/" name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0asaba04y6rwc7nx898p89jdxkbnsb3dxjvpdi8xb1rbgyms80c9"))
|
||||
"1wr4bc5806xzyqpi6m4rjaf61za6ylpx4g0kfk95c6yw9yhg5vqb"))
|
||||
(patches
|
||||
(list
|
||||
(search-patch "icecat-avoid-bundled-libraries.patch")
|
||||
(mozilla-patch "icecat-CVE-2017-5443.patch" "6daaaff9f1f6" "0jvb6y5fiwr13fyx58k49n81kv6h03vcch502g57y6nsx2wsqng6")
|
||||
(mozilla-patch "icecat-bug-1319087.patch" "82297fcc6f19" "02qcbg2r2smswgnwj7fs5bcrr3rlqbpsh2nmcbsjyblp5fk1ag36")
|
||||
(mozilla-patch "icecat-CVE-2017-5429-pt01.patch" "dd526ebe7e58" "1rj0pz6iql59zrynz48njcfg8i0v55bjdndplss9wl37lfydl7ca")
|
||||
(mozilla-patch "icecat-CVE-2017-5447-pt1.patch" "3bc981f85a17" "0am9k3mii2r05lp6xpizxp356mb8xrbqs9kmx0wx5wyy08wjzmks")
|
||||
(mozilla-patch "icecat-CVE-2017-5447-pt2.patch" "4f752b0e5920" "183s5dwzd57b299grvyvn139fsp9am0smd3yb4shw8g0iwzz61nf")
|
||||
(mozilla-patch "icecat-CVE-2017-5449.patch" "1714eda3de9b" "0ncngdpzvffvpw4c1mi0dda5l02lwyil4rnq3i6salnwlrq9x32z")
|
||||
(mozilla-patch "icecat-CVE-2017-5455.patch" "b10922304d81" "0rglbavb8rx7hl53ksgypazz27263b1yn97gznpdsq89zhirfw3m")
|
||||
(mozilla-patch "icecat-CVE-2017-5446.patch" "d98de46f8f27" "040agykr4w4wsbi0xm3rrrjxk48iwz8l1hn11vfv45nzsx2f1hzq")
|
||||
;; The next patch is for CVE-2017-5436 in the bundled graphite2.
|
||||
;; TODO: apply additional fixes from our system graphite2 to the
|
||||
;; bundled copy, or upgrade it in place.
|
||||
(mozilla-patch "icecat-CVE-2017-5436.patch" "e6132f638311" "07w9pijx42psgmkj2i6i87lf30gl0yyb5caz6wz7fm8phi8wwy9p")
|
||||
(mozilla-patch "icecat-bug-1342395.patch" "0e0e8abe2153" "1xlnq2fd50kf0rz9dibz5vlaa9zj2pifjvky2fdykcan62xz75hy")
|
||||
(mozilla-patch "icecat-bug-1342841.patch" "623afac083f8" "1pv86j0dxdmi7g3rx4zqplz4gxq5lfyzpdssq83naypcxic6zafb")
|
||||
(mozilla-patch "icecat-bug-1344644.patch" "cac0735c228f" "0695f0hvxnzgcirgxx3axn5nhkywqxjcvnrlhg7jwfann4mnbsfn")
|
||||
(mozilla-patch "icecat-bug-1322660.patch" "9d6d60e64255" "0ds74ilhyc9qkkjgkm0xk7ay3926971rzwfh2avhhkfargn7idib")
|
||||
(mozilla-patch "icecat-bug-1343330.patch" "6f23bd449bc7" "1igz6yhx803hygf7cii8bchx7bfw1niq8s0nc5l9i5rb8ml2b7f0")
|
||||
(mozilla-patch "icecat-bug-1346961.patch" "3a2dc54cf986" "0dfp3s7d43zx3svajbkhvi73b71hhr7vrc9yz0iz37pykg40c4hn")
|
||||
(mozilla-patch "icecat-bug-1318070.patch" "a68d6d9b87d0" "1yqgkgv7i0xy5dm0pgg1cbav4qglsdk8brzcjcpfz65bmn1pqrhh")
|
||||
(mozilla-patch "icecat-CVE-2017-5448.patch" "6684a3c7f834" "0agyynvcjk28d7l2l4cqz67ddg9xw7ymiirb0npabd1si9zj27xb")
|
||||
(mozilla-patch "icecat-bug-1336345.patch" "590416f46ec8" "1q2svqjd735rickr9i3kdkd0la6ikdphhmzr19h1r84nrl6a87ia")
|
||||
(mozilla-patch "icecat-bug-1336356.patch" "00ba83ac39be" "1h6qsfv4r9mlc2ihjm9kmzi76aijdnnyx1g2r30ia87xha106pnk")
|
||||
(mozilla-patch "icecat-bug-1342363.patch" "10285b4a6b71" "0l2ww19y6qbarcp9brjgbpf4vi3k38r6ak8is5736vqz0c17dim0")
|
||||
(mozilla-patch "icecat-bug-1343787.patch" "28287b7f0938" "1w85s9rqh0dyfx6qn5plypbypz9casig03b6yiy9bpiq7ckrxz56")
|
||||
(mozilla-patch "icecat-bug-1292803.patch" "adbf7b59a405" "1l1p0b5rc05czk6kr3k3k99m1fkwphj2jrd092gdbib8q4m4cvzv")
|
||||
(mozilla-patch "icecat-bug-1313869.patch" "eba25396310b" "1ws0dr0kwclzbc2m0sihd3aqvbbg57ycia0fg6y294k6qipcxv38")
|
||||
(mozilla-patch "icecat-bug-1141756-pt1.patch" "f7c262517722" "0r1zzbxf47q5w8vcy402yin105ngam3csb2q7h7n8axm97307ykp")
|
||||
(mozilla-patch "icecat-bug-1141756-pt2.patch" "420396d5e26d" "0yv1pmpydzkirfwrxrgbw98dm4a9a4s0izha0wabrp4lb3655jv5")
|
||||
(mozilla-patch "icecat-bug-1343210.patch" "ed9521749d6f" "1j2zzi00qyqjgh15ingvl6f88zlk4imp31m5jmf7w5f9jqi5ly3k")
|
||||
(mozilla-patch "icecat-bug-1342442.patch" "775b6f85ef81" "00h9dgds7jv9n4cznj5qhh8liaf1b3wvnlqc2z7a3kj07ijllwzb")
|
||||
(mozilla-patch "icecat-bug-1344527.patch" "d4612b14c907" "1n3a0mp351a7xgvshm6688gh89hg0xci3y621zs2pyqsfm114366")
|
||||
(mozilla-patch "icecat-CVE-2017-5442.patch" "5f1aa2336998" "1y2marhrglc66vchd6z0jdmhg0pmkxp1cwim63bp9l6pj7lxyjma")
|
||||
(mozilla-patch "icecat-CVE-2017-5430-pt01.patch" "512604631b23" "171nzxr4av4818d0fyg9hcsdxkai61sghl45xnsr2al34l28wsw3")
|
||||
(mozilla-patch "icecat-CVE-2017-5430-pt02.patch" "16772200ad6f" "087j16rcbs5kgvpa096kd6jarwwwfrhwph54wzjn671wr1vnsvvd")
|
||||
(mozilla-patch "icecat-CVE-2017-5441.patch" "c744e9d57250" "0m70157lczf17hxb2pabsl3grhcjqallbdfpsd58q8q6fk99k6x3")
|
||||
(mozilla-patch "icecat-CVE-2017-5433.patch" "b4fc7a4cb5e0" "12q6mr5prpgqg5xnrww09qjm3jx2amb8zig62cd46ba8n9z2j9ab")
|
||||
(mozilla-patch "icecat-CVE-2017-5429-pt02.patch" "21eac0b4fd2f" "1a6v0hwcc26gnlxygplc11dfzc8bykhh44j4gsz88kl5c5jqhlk9")
|
||||
(mozilla-patch "icecat-CVE-2017-5432.patch" "62df7046e959" "1qvxbpkf87g4vnl8hxqvwb1ydrpkqq3rbkivr8q4029rvgalf4rf")
|
||||
(mozilla-patch "icecat-bug-1350599.patch" "f6a978b2fcec" "0rkbbmw52mxgrmn1xny4jkn3slwb5jsqs4yr07ffhz7r801jy9iz")
|
||||
(mozilla-patch "icecat-bug-1332839.patch" "2ad0f87f5dba" "04458jidri521hgf3r63pl736zz4gmgv6b8spa32anfb7gryj8fy")
|
||||
(mozilla-patch "icecat-bug-1337548.patch" "29a1ad09a6ec" "0pld81bpc34w6g2ara54sx30msas55kwzr537pvxxc002lpvzs57")
|
||||
(mozilla-patch "icecat-CVE-2017-5430-pt03.patch" "5dec7534760f" "1xh0y7srl7nznb6szpfiykd6r1ibyxrdvasc36w0chqjdmq7xr32")
|
||||
(mozilla-patch "icecat-bug-1343851.patch" "e104d53316d7" "1yhv3qvzzi3kr881ji1dnm8ydnr3snh2vzl3c4vdzmvrjx8q5rcb")
|
||||
(mozilla-patch "icecat-bug-1345222.patch" "864644fadcb0" "0qpplxyfn87bigzdkwlrhj9isd5gfafhjgqfckb239a09wwrblf3")
|
||||
(mozilla-patch "icecat-bug-1348584.patch" "7cee9ad555af" "0856bpa3n71a3y5m4gilcdb9ghb60p545xkv9zbr245r20mj32ds")
|
||||
(mozilla-patch "icecat-bug-1346720.patch" "6a597a9cd494" "091a5sanw3w3gl0jcmf8d60m59vwbh5v36vnar20m0hl7xrv4v7p")
|
||||
(mozilla-patch "icecat-CVE-2017-5430-pt04.patch" "09693629803f" "18fhmsghq0232mhh8j10cy0a4979nmkbh43jlcyrg3l63l7795k4")
|
||||
(mozilla-patch "icecat-CVE-2017-5430-pt05.patch" "2b8268ea97a9" "0l0f54krxdmqbgldikwjncxvn6irihcljldd3z039himrvplisjg")
|
||||
(mozilla-patch "icecat-bug-1347700-pt1.patch" "ee706896916c" "0m85x80y98c154hyis08kcy81kbw3v34na1v862vxzs939d3mc0n")
|
||||
(mozilla-patch "icecat-bug-1347700-pt2.patch" "08ecc2d92f81" "1s6411ccifw9l22hhmf32nhm8r5hbclnhy7jm2n228sqfr4h971g")
|
||||
(mozilla-patch "icecat-bug-1337682.patch" "15af6a323161" "1nxbwd0574gscnkxfyhzv3yqvxiccb2d0rmba9vi6i62646l2pd5")
|
||||
(mozilla-patch "icecat-CVE-2017-5451.patch" "d91260f0069a" "15w4rzz51hps2fr8djf5z1rzdwxshclk936mxv5anx1skkwms0y8")
|
||||
(mozilla-patch "icecat-CVE-2017-5444.patch" "7740cf7e121b" "1706mx4zmnib336p2wmfp9ncyl66lk2da82f28xvcw262mg1c8lw")
|
||||
(mozilla-patch "icecat-bug-1347164-pt1.patch" "b35a6d6dcdca" "077r0pns58fw3xd3qnbhib4q21vvw0aynpa8iyn1pycg8mppmd0f")
|
||||
(mozilla-patch "icecat-bug-1347164-pt2.patch" "a42fc05969b9" "1ijq8ccsk5k56h77sv5kqv48w7csj3vbakzq98awgbvypzfdyhss")
|
||||
(mozilla-patch "icecat-bug-1347164-pt3.patch" "f78ac1ac0a37" "0kj6jq482cqwyngy1kmb69zpq35xah8h33kml8i4l7andiyaq3zm")
|
||||
(mozilla-patch "icecat-bug-1347164-pt4.patch" "795a3d48a775" "18lw99hmrr93k95hk6v6bx5rcf22aa902x2yf5p6wxdqg56nc0zp")
|
||||
(mozilla-patch "icecat-bug-1338699.patch" "94ce63191069" "0rdivablincah3gbgl4wzjmqlraazivmr8bhqxdpy8dk0a6fvv4s")
|
||||
(mozilla-patch "icecat-bug-1342301.patch" "e640e758a7cd" "17f36vvf82n6shlaip7ji8qsy9861f9a5r79h000p3wb3bb7lbfs")
|
||||
(mozilla-patch "icecat-bug-1342170.patch" "df7ed78b7c0a" "1kq256i66hcm2k9d37i5ws354ksv3bbglmscdjv2v5f7wg3y967v")
|
||||
(mozilla-patch "icecat-bug-1342634.patch" "d72e56823bbb" "0c186d77lyyg0hjxw15d44rybw6yr5aw8g9m3311xfdn5wiygijb")
|
||||
(mozilla-patch "icecat-bug-1348796-pt1.patch" "cef01720769e" "0h57372lxanjs5zw9b3vwr2x36yz9gj73swyg50aqp13j4rcbpmy")
|
||||
(mozilla-patch "icecat-bug-1348796-pt2.patch" "7d3584b75f20" "1a4hvpsvn39832g54hsxhqs24cq8v4nd69jqskkgc1ybs09ncmr3")
|
||||
(mozilla-patch "icecat-bug-1192800.patch" "e56b0938ea0f" "1hlbxhjzj65s6p2v6f66zdfb3gw5yx77msgq5idsv9jip2w88mpq")
|
||||
(mozilla-patch "icecat-bug-1309438.patch" "1f30d97563c8" "0rvq729fg9j959ha9qvw5wv7r6vw70qvpy7ynifgqhgrpa749n70")
|
||||
(mozilla-patch "icecat-bug-1315332.patch" "66495c8d9459" "0vzlx8i0cidpymm6ar07h3yk63fxf64f0b2vb0pihd72h0jzd5s9")
|
||||
(mozilla-patch "icecat-bug-1346439.patch" "a9fcc2dc324a" "13991jijwa84yczkmc212s23w269r8b1a4yiygqgwaily29l1dc5")
|
||||
(mozilla-patch "icecat-CVE-2017-5469.patch" "3dcc5f5c2df4" "0b36m6rgxc05h39l6wkzi6dlmq9brcigk7xjrifs4786f0z564hz")
|
||||
(mozilla-patch "icecat-CVE-2017-5430-pt06.patch" "ac0ca89b5a6b" "1646y9y2wmq8pxb081x3076dq9ana7hh5fxwbsnn17v5wqhi8gfb")
|
||||
(mozilla-patch "icecat-CVE-2017-5467.patch" "6ed26e6c1a09" "0r1n1dwb4l8xwlns0aifyka6mldb6cy2crhh2qkap64cpj3bzl9s")
|
||||
(mozilla-patch "icecat-CVE-2017-5439.patch" "2fde528ca7b6" "0iv0sjhnh7br0z3pcpk346wbj162ynacfk3p9309hg6kr1cd92fp")
|
||||
(mozilla-patch "icecat-CVE-2017-5440.patch" "d88bd03d1234" "1pls63djh4w5023ag3fwjk79cpx816ilgajl5l1qlqyacl8c0v4p")
|
||||
(mozilla-patch "icecat-bug-1349987.patch" "3282e8f6a121" "1dyc84h7v0l9gndmbiwfqk33f703zr3fv96mwbn58msdf20ma9l2")
|
||||
(mozilla-patch "icecat-CVE-2017-5434.patch" "ee0a7b55e470" "01vs4p56p0ii0fvmg0kn7gaz6gwf2kwmv6v4pa6v68hwxx1phaag")
|
||||
(mozilla-patch "icecat-CVE-2017-5430-pt07.patch" "a4e1e04c88ee" "0q07qwzxf2iisrhknjbn1zksv2rr6qzzh6w8ibzlj1sqbdg3h852")
|
||||
(mozilla-patch "icecat-bug-1335043.patch" "a49419f75b9c" "0pkh5yimnj3p1sd2g9vndgcn11zdx6yhpa88s8vk7fqbs8gf1fz3")
|
||||
(mozilla-patch "icecat-bug-1299500-pt01.patch" "5fdd36b4400a" "1gdrsbf03wf9v90f1bd2sp9ac38a9lzpzfrv8l8f7gvy70acjxmb")
|
||||
(mozilla-patch "icecat-bug-1299500-pt02.patch" "34776df5ce44" "15mlf59ii0rk97j8mlf3wz1q0w28ma5mll47dvci6cv3dziai9f1")
|
||||
(mozilla-patch "icecat-bug-1299500-pt03.patch" "26189af0f504" "1wh1s2xd1w03zi5jdaagk6j5i8v9xsm9360xmv446wdraygkqbci")
|
||||
(mozilla-patch "icecat-bug-1299500-pt04.patch" "798a8fe17e7b" "0vlalanffq3paa7zab003v1d377x5pvcsy8nc8fr5pdlvi622jll")
|
||||
(mozilla-patch "icecat-bug-1299500-pt05.patch" "daf2e4f2bd5c" "1rxbjbyr1a6dxjb0qj6900g3kqjphir40pis4qcfl8q811y18jwk")
|
||||
(mozilla-patch "icecat-bug-1299500-pt06.patch" "1187091c3134" "0r8zz4zbglxg6sl0ybz9lyq1c5w2nqp0xcn2d3rz9bvyj8byqc7m")
|
||||
(mozilla-patch "icecat-bug-1299500-pt07.patch" "a908f2c2fe30" "1fvwy3fxfrdi9y8hmf4f9aa72i0g6s55s8cp0w22gllsl1f6gvyf")
|
||||
(mozilla-patch "icecat-bug-1299500-pt08.patch" "e95a26cf7a42" "0pd0kcn7dqd1gy1si85as5zzc96v7vq0v8n3g3gjzms5rdnk085l")
|
||||
(mozilla-patch "icecat-bug-1299500-pt09.patch" "d63f3b14e571" "0cqd7dal6prsrj7bn2d699idbq4fzjry9vqlbmm9dkyn5683sdy1")
|
||||
(search-patch "icecat-bug-1299500-pt10.patch") ; Adapted for GNU IceCat, based on:
|
||||
;"08f2bc167ae8" "07d1i23ffvi74a5558bb0645vbrap6qlrpcwfyb7dm3llbfnfycy")
|
||||
(mozilla-patch "icecat-bug-1299500-pt11.patch" "263f27805689" "0nczkvyvlpdjif3xfvj7g2mfz6j06w99x2sblqfmqq6mwrlavpq0")
|
||||
(mozilla-patch "icecat-CVE-2017-5456.patch" "538e0b382cc2" "0wq2ywn4a7i4ypcx03hl23a4xx3lavz7y505m9kw43fx15r4070r")
|
||||
(mozilla-patch "icecat-bug-1280079.patch" "6fbcb6a4b91e" "0qcwz9js1bwlnwyv3vhkm0hvahd043lm2bijqsmm0jy20dbslga4")
|
||||
(mozilla-patch "icecat-CVE-2017-5435.patch" "a362e1205ba4" "127i4ybfb4dk5axp4dxcl7ag7zyx7b517myvs6q4yd8981d1jjd3")
|
||||
(mozilla-patch "icecat-bug-1341960.patch" "b24ce30e8cfa" "0a521wn8hbaliawmxs21b8wc1gkha8iih62j4zyrfg5rm7ff6p6s")
|
||||
(mozilla-patch "icecat-CVE-2017-5454.patch" "ac40d4a4e414" "0dnzz95vpq32bsh6hajk4hrcrxwd4w6m7kayl2iziryny86jgak2")
|
||||
(mozilla-patch "icecat-CVE-2017-5429-pt03.patch" "e469af8e9ccc" "0yn8zqakr9yw0jvysxyc8if09kqf4fr5rq4p9qdkb1p81p4dpmp5")
|
||||
(mozilla-patch "icecat-bug-1351094.patch" "4c1383e76adc" "0wdldx88qabyhrwnnii44pggmfgqylzxy6ckwzgq86r2yipi4rsq")
|
||||
(mozilla-patch "icecat-bug-1336527.patch" "b9f53baeabb3" "0y1l641ffbr4i85p0wc1ir6bcsy6h94bchbfc7ppxfijva4fjgvd")
|
||||
(mozilla-patch "icecat-bug-1345716.patch" "2569af645a98" "1d6lx85ij90j6q6ixwp0h3w7y424yvkz0njsi0my727akbli5rsn")
|
||||
(mozilla-patch "icecat-bug-1208957.patch" "2b68880d8f6b" "1pl0vkv7clyjchi9kg4995z82sr8xv7cbz1kvsg1v66md6pmp4s4")
|
||||
(mozilla-patch "icecat-bug-1208957.patch" "bc646835442b" "0f29r5yvlb5w84nvvn6j9r9dq5314jgygjmsna3grzigpkb88gyj")
|
||||
(mozilla-patch "icecat-bug-1347944.patch" "47cb652ddc25" "0n7871958zwndwz53xvzwjv41v5ar1vxaam8kzr5dkbqmprddimx")
|
||||
(mozilla-patch "icecat-bug-1347632.patch" "7d8f7a52a108" "0gkbkzkz989j7pk3ia1rfvyjg3si8hnnadwkb2rw13qjxdzhx2zn")
|
||||
(mozilla-patch "icecat-CVE-2017-5438.patch" "154c93b9435b" "00f8lr5s8h68392bb45zi0xfgqrgfkdxbzwdypp10d89784fvjvd")
|
||||
(mozilla-patch "icecat-bug-1347486.patch" "15dbaf157058" "1mwgfnx1zsvhp0pgmc8577yw6lnf7g3ikdfj0r21fgffrn76bp69")
|
||||
(mozilla-patch "icecat-bug-1218437.patch" "e13692bfd5f5" "10jrbs26m8l1vchw6svssrb5h8p82acrcmkx92ybvv4qbaq2bcl0")
|
||||
(mozilla-patch "icecat-bug-1345853.patch" "5fa27dc4c4a3" "1sqqa4hir2bsnnwnlr34has62kpncmw6l9mylwprd09fxmzzgrd7")
|
||||
(mozilla-patch "icecat-CVE-2017-5429-pt04.patch" "00c051cd38c7" "1d4aa4nqyjc01mg3jvdjjp7z05c2qhdjj85dhdrd9c18gfiyv4fi")
|
||||
(mozilla-patch "icecat-bug-1349921.patch" "c6897adc4037" "0acvcdy8awdmpz84243jzf82agrm73wqa198fjbns1p1v3s425z2")
|
||||
(mozilla-patch "icecat-bug-1338623.patch" "edcafd42dd52" "1xqgjy7a62jsyz1b5mibrcnd7zpb4gdaas0a6z5dwfvz52j4xa16")
|
||||
(mozilla-patch "icecat-bug-1294799.patch" "0617b074ec3d" "19h7dj44shvdzzj87svpv5q97cikxyxhiwfzf9rnqj1b7fw0xrdh")
|
||||
(mozilla-patch "icecat-bug-1345049.patch" "88466b911357" "16pgd13mw9a0snyhq6vxmjc7kr9mikvhazkgbc6vpykwi0i0z85b")
|
||||
(mozilla-patch "icecat-bug-1339999.patch" "b7cb8f8b0877" "0zv1kxcva699ahb9s36l4d9mlrkm0b7hmh6g1422j6iijn136vxb")
|
||||
(mozilla-patch "icecat-bug-1350868.patch" "ddd6c44790c0" "182ii4wsz2vdd1q4dszd5hka8i2n0ghmqk7l39bd02d3zfibhhvc")
|
||||
(mozilla-patch "icecat-bug-1342360.patch" "416681a239ef" "0ngs8xgmdhz9ag4dlrqhr0vmanqxr9q2vf16jpm3cimyc06zjxz4")
|
||||
(mozilla-patch "icecat-CVE-2017-5429-pt05.patch" "a76e626ae6db" "0zn2j8fmhp7502kx1jhrvh85vsys5x6x6gw3v4gl0h8px354v6yw")
|
||||
(mozilla-patch "icecat-CVE-2017-5429-pt06.patch" "0ce4196ab86e" "0isczy8261qz2zsdxax4j51gypz0gi39q7nfwxg88sl81kc5vym8")
|
||||
(mozilla-patch "icecat-CVE-2017-5429-pt07.patch" "39da731d80ed" "0vswnv1hqa7r8iz6y5ja7i6w3cyq5xrcd66c1q29ac6n4gn7x338")
|
||||
(mozilla-patch "icecat-CVE-2017-5430-pt08.patch" "1b148cf9c545" "0ilrib0c2c7mfycpz2hq3vrfdf6sf8lcdbfjk6r4xyxv54vh3lwk")
|
||||
(mozilla-patch "icecat-bug-1325841.patch" "74e9f13c554f" "0glzcgjsy71y78zaccn33w8djs96i6dd3gafyzkihnkpfddd5cij")
|
||||
(mozilla-patch "icecat-CVE-2017-5445.patch" "d7d87adfe186" "02p705si2j69ya8n5a916x58nycs07ja0sfpxrwl16f4n2plc91h")
|
||||
(mozilla-patch "icecat-bug-1346424.patch" "5ede402f494f" "0kbx8yn8ppv7099ic6nhw32f7h42pnwk6dpvb179ilw90ah902q7")
|
||||
(mozilla-patch "icecat-CVE-2017-5430-pt09.patch" "da44c5cfab2e" "16i4dz5sfkhh3a0khrcf8zn5w20rkf4aqwygjj3cp4qhdh7wnr75")
|
||||
(mozilla-patch "icecat-CVE-2017-5430-pt10.patch" "0f966927bd55" "07pkhc6l6ylwrzgfm7i1galrvjawqqrhvhk6jcw4b30sfhi0bxq1")
|
||||
(mozilla-patch "icecat-CVE-2017-5429-pt08.patch" "f0f591f82cc0" "18p091503vpfpp4l3d7hkqj78zavv6qj1lynhlfx67zdp3xqcf8r")
|
||||
(mozilla-patch "icecat-CVE-2017-5464.patch" "1852dc0beba4" "1zdnkrsqjfv1q2jhj4829ypiwyg78n4jv54yn3b74vwcf5zvzx8m")
|
||||
(mozilla-patch "icecat-bug-1083140.patch" "6913f0537208" "0vaf61ryp0bzkz6l1w73alhglibbgm0jcgccxvvm43ni67pcxqbq")
|
||||
;; The patch commented out below updates the bundled tzdata,
|
||||
;; but we can't use it because it contains a GIT binary patch.
|
||||
;; TODO: Consider updating the bundled tzdata, or unbundling it.
|
||||
;; (mozilla-patch "icecat-bug-1343493.patch" "35496444b380" "1wa79az7121xw078cgpczxavrqy0fsp4ib2nb69giha6acxcaqas")
|
||||
(mozilla-patch "icecat-CVE-2017-5430-pt11.patch" "64495dfa29db" "0m7vklnwnaf7sw97m87bm4lb9pjmlh1vvrbaf1931db8nhd6m737")
|
||||
(mozilla-patch "icecat-bug-1350783.patch" "26cd34db3c14" "15vq3lrilg3n9j80cdjmk7xib2iq5gcx9ypq8xs7f5ya9ibasqlx")
|
||||
(mozilla-patch "icecat-CVE-2017-5429-pt09.patch" "6cd77a0d7ac0" "0kxlbl5m3gffxqrv7ky3swsbyg1ykj0wjhlfl9amsb4g8gra3zkj")
|
||||
(mozilla-patch "icecat-CVE-2017-5460-pt1.patch" "a803be74843c" "1ywwakzjkfr714i9pfn152n86c6rp427chzdys8phdkcvp5d5p45")
|
||||
(mozilla-patch "icecat-CVE-2017-5460-pt2.patch" "73762c1392ae" "18jy9ccqvn6l6hznvq5xsqm1pc7i81svc2grgv21wfwg9sd6zwwh")
|
||||
(mozilla-patch "icecat-bug-1337392-pt1.patch" "4ab6d5c43036" "07pygzngssra9wnmqqrs24d6gc5kfh20fkzvpcasxh4f2hi21z9b")
|
||||
(mozilla-patch "icecat-bug-1337392-pt2.patch" "13f2d85da9a7" "1iwfz7dp5i93bhjspy4kyz0vqrl8x8ndg5kxdyzwb1b339xim9qy")
|
||||
(mozilla-patch "icecat-CVE-2017-5429-pt10.patch" "7a30cddfcd54" "1773pijh6gi086l930cn1a0k7kvy7f3cnirfblw98sq7h9qfyy33")
|
||||
(mozilla-patch "icecat-bug-1345873-pt1.patch" "75cea353ad78" "14cig2y7d3p033hx3096gxzlqwgddq8d0ig0g3l8p1b0xwvvyryl")
|
||||
(mozilla-patch "icecat-bug-1345873-pt2.patch" "b08ef5a82f89" "0afz01jv850x09df85d7ycqkcdlafi4w2xi5k155lk2b92w8lhpj")
|
||||
(mozilla-patch "icecat-bug-1340163.patch" "f3f2a995a239" "1ydsj4ja475jscalkw6ggdxgbsp5l2mam5109k0y7c98abzqraxk")
|
||||
(mozilla-patch "icecat-bug-1348174-pt1.patch" "330904d6f0dc" "19wnp4d8481w86xkk78n7c7wrr99rq6cq3v09hd8am4n0mzwzaja")
|
||||
(mozilla-patch "icecat-bug-1348174-pt2.patch" "c61b99483c4b" "0mjsahi8ly24415ri2sylas6g0kb8wawi095idqiq019c3r7q9cq")
|
||||
(mozilla-patch "icecat-bug-1348601.patch" "1848bd238064" "1f5kadhn6w1rs26sdrcc3mq0zzlmmsm6ymqhshkzn57nrj6akm7b")
|
||||
(mozilla-patch "icecat-bug-1345991.patch" "2008a4b89d9a" "07fkg9r2rxbk362ckv2h8inhd2dadvzigshm6zsjfjs2fyzp95hp")
|
||||
(mozilla-patch "icecat-bug-1344498-pt1.patch" "9acd0103d67f" "1f0j667g05h9ydmc924cs8mzif1n7s56wixsgnyqc3s231dswhml")
|
||||
(mozilla-patch "icecat-bug-1344498-pt2.patch" "49aadb25b1ec" "0s618m802b1x5pyqh5mj1azaxch7ggxq9503b7mwhg90vz8qw7ki")
|
||||
(mozilla-patch "icecat-bug-1344205.patch" "34b453085dc0" "02h1bh24f9i5sm3my07m2q58cpzqfhagwwv11l9fidxcm9dmzmrd")
|
||||
(mozilla-patch "icecat-bug-1349862.patch" "864ff0c36b6b" "1i3wmigv982x9hzkfg25jhyvkynmar69x6cj6r4g9zkk5f5ypdh5")
|
||||
(mozilla-patch "icecat-CVE-2017-5459.patch" "5ec6fbedb420" "07flhha4rkjbry5590yr5by36ypb1k33qm3rzkbmw0vk5gyak8dp")
|
||||
(mozilla-patch "icecat-CVE-2017-5465.patch" "2b95de78a92c" "0vvq1fz84yyw7za929x6ki25paivlwd4ng1ddkcb2bw6da6yp12k")
|
||||
(mozilla-patch "icecat-CVE-2017-5466.patch" "a5ec5e70abf1" "1jjviyk6db8iccd7997mwmgs188fsyrzivap3ffjf8m6j4mf9cra")
|
||||
(mozilla-patch "icecat-bug-1347646.patch" "1b50711a46ce" "1i3505zzgf0mvg2405y2gzq36xc8ic2ga8w6d3n9kqryxj0mc7bh")))
|
||||
(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
|
||||
|
@ -519,7 +483,6 @@ standards.")
|
|||
;;
|
||||
;; TODO: Use system graphite2.
|
||||
;;
|
||||
"dom/devicestorage" ; Removed in ESR 52.1, awkward to patch out
|
||||
"modules/freetype2"
|
||||
"modules/zlib"
|
||||
"modules/libbz2"
|
||||
|
|
|
@ -63,7 +63,8 @@
|
|||
(arguments
|
||||
`(#:modules ((ice-9 match)
|
||||
(guix build gnu-build-system)
|
||||
(guix build utils))
|
||||
(guix build utils)
|
||||
(srfi srfi-1))
|
||||
#:tests? #f ; Tests are run by the all.bash script.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
|
|
@ -98,7 +98,7 @@ arrays of data.")
|
|||
(define-public gstreamer
|
||||
(package
|
||||
(name "gstreamer")
|
||||
(version "1.10.4")
|
||||
(version "1.12.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -107,7 +107,7 @@ arrays of data.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"062jidnw17hkpva6ddygp80gyasyigfkpm1y7w56rk56a2pzbhjh"))))
|
||||
"00j3zwm22582fwyzh316mnh6ghicv4ya93yk52kz4avx57wfxm8l"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
|
@ -146,7 +146,7 @@ This package provides the core library and elements.")
|
|||
(define-public gst-plugins-base
|
||||
(package
|
||||
(name "gst-plugins-base")
|
||||
(version "1.10.4")
|
||||
(version "1.12.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -154,7 +154,7 @@ This package provides the core library and elements.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dsyjf6rncsbg4rfj40cvf1wwpjj9h3j3c7bh4zp7jylnfv4blpn"))))
|
||||
"0k9nckvzk2hhhg7w4gzmd7is0lbswdmrkwmcgblvdf2lgy3wcprl"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(propagated-inputs
|
||||
|
@ -201,7 +201,7 @@ for the GStreamer multimedia library.")
|
|||
(define-public gst-plugins-good
|
||||
(package
|
||||
(name "gst-plugins-good")
|
||||
(version "1.10.4")
|
||||
(version "1.12.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -210,7 +210,7 @@ for the GStreamer multimedia library.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0zjdwxn83sp9wjp9rxjbyk8kf284g9av7l2v6rjldi586hacd1la"))))
|
||||
"1g1f6xyj0f06nmsl01xhr32x2rwyb857yjkrig1013iknx6p67ca"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("aalib" ,aalib)
|
||||
|
@ -266,14 +266,14 @@ developers consider to have good quality code and correct functionality.")
|
|||
(define-public gst-plugins-bad
|
||||
(package
|
||||
(name "gst-plugins-bad")
|
||||
(version "1.10.4")
|
||||
(version "1.12.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gstreamer.freedesktop.org/src/"
|
||||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0rk9rlzf2b0hjw5hwbadz53yh4ls7vm3w3cshsa3n8isdd8axp93"))))
|
||||
"0d45zgdnflwpwvlb1fmgj35yfds9m1g46mhppvlsh5dky7zkrdqi"))))
|
||||
(outputs '("out" "doc"))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
@ -343,7 +343,7 @@ par compared to the rest.")
|
|||
(define-public gst-plugins-ugly
|
||||
(package
|
||||
(name "gst-plugins-ugly")
|
||||
(version "1.10.4")
|
||||
(version "1.12.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -351,7 +351,7 @@ par compared to the rest.")
|
|||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ngsiwcsz3jd08id4mc0qiy2q1n7h2kkvdnh3r1vm725m1ycg1k3"))))
|
||||
"1mhasi20kvi9p72kh4qyfzync509wqqkk8fp2xxyhgp88r8bls2y"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("gst-plugins-base" ,gst-plugins-base)
|
||||
|
@ -382,7 +382,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
|
|||
(define-public gst-libav
|
||||
(package
|
||||
(name "gst-libav")
|
||||
(version "1.10.4")
|
||||
(version "1.12.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -390,7 +390,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12r68ri03mgbbwsxyn6yklgfsq32rwvyq83zw0aq7m73fp5gx83c"))))
|
||||
"1i2h0ymh9jy0rnkcan2rdsdfq7l02rmp33g712q81s9fcizlgl9r"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--with-system-libav")
|
||||
|
@ -420,7 +420,7 @@ compression formats through the use of the libav library.")
|
|||
(define-public python-gst
|
||||
(package
|
||||
(name "python-gst")
|
||||
(version "1.10.4")
|
||||
(version "1.12.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -428,7 +428,7 @@ compression formats through the use of the libav library.")
|
|||
"gst-python-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"04l2hvvz9b0f3nyds1k3yfk5di8a91fpr6maj19c11mwp1s82l2r"))))
|
||||
"01wwbn6z3771ad55ljl9gs6irrs9a8p186zrgrkmzs91kxmxwcxy"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; XXX: Factorize python-sitedir with python-build-system.
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
(define-module (gnu packages guile)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages admin) ;;for tree
|
||||
#:use-module (gnu packages aspell)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages bdw-gc)
|
||||
|
@ -690,7 +691,7 @@ for Guile\".")
|
|||
(("moddir =.*/share/guile/site" all)
|
||||
(string-append all "/@GUILE_EFFECTIVE_VERSION@")))))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("guile" ,guile-2.0)))
|
||||
(native-inputs `(("guile" ,guile-2.2)))
|
||||
(home-page "http://savannah.nongnu.org/projects/guile-json/")
|
||||
(synopsis "JSON module for Guile")
|
||||
(description
|
||||
|
@ -706,7 +707,10 @@ specification. These are the main features:
|
|||
(license license:lgpl3+)))
|
||||
|
||||
(define-public guile2.2-json
|
||||
(package-for-guile-2.2 guile-json))
|
||||
(deprecated-package "guile2.2-json" guile-json))
|
||||
|
||||
(define-public guile2.0-json
|
||||
(package-for-guile-2.0 guile-json))
|
||||
|
||||
(define-public guile-minikanren
|
||||
(package
|
||||
|
@ -794,6 +798,74 @@ See http://minikanren.org/ for more on miniKanren generally.")
|
|||
(define-public guile2.2-minikanren
|
||||
(package-for-guile-2.2 guile-minikanren))
|
||||
|
||||
(define-public guile-miniadapton
|
||||
(let ((commit "1b5749422304567c96ac5367f2221dda9eff5880")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "guile-miniadapton")
|
||||
(version (string-append "0-" revision "." (string-take commit 9)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/fisherdj/miniAdapton.git")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"09q51zkw2fypad5xixskfzw2cjhjgs5cswdp3i7cpp651rb3zndh"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build utils)
|
||||
(ice-9 popen)
|
||||
(ice-9 rdelim)
|
||||
(srfi srfi-1)
|
||||
(guix build gnu-build-system))
|
||||
#:tests? #f ; there is no test target
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(delete 'build)
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((cwd (getcwd))
|
||||
(scm-files (find-files "." "\\.scm$"))
|
||||
(effective (read-line
|
||||
(open-pipe* OPEN_READ
|
||||
"guile" "-c"
|
||||
"(display (effective-version))")))
|
||||
(module-dir (string-append (assoc-ref outputs "out")
|
||||
"/share/guile/site/"
|
||||
effective)))
|
||||
|
||||
;; Make installation directories.
|
||||
(mkdir-p module-dir)
|
||||
|
||||
(setenv "GUILE_AUTO_COMPILE" "0")
|
||||
|
||||
;; Compile .scm files and install.
|
||||
(every (lambda (file)
|
||||
(let ((go-file (string-append module-dir "/"
|
||||
(basename file ".scm") ".go")))
|
||||
;; Install source module.
|
||||
(install-file file module-dir)
|
||||
;; Compile and install module.
|
||||
(zero? (system* "guild" "compile" "-L" cwd
|
||||
"-o" go-file file))))
|
||||
scm-files)))))))
|
||||
(inputs
|
||||
`(("guile" ,guile-2.2)))
|
||||
(home-page "https://github.com/fisherdj/miniAdapton")
|
||||
(synopsis "Minimal implementation of incremental computation in Guile
|
||||
Scheme")
|
||||
(description "This package provides a complete Scheme implementation of
|
||||
miniAdapton, which implements the core functionality of the Adapton system for
|
||||
incremental computation (also known as self-adjusting computation). Like
|
||||
Adapton, miniAdapton allows programmers to safely combine mutation and
|
||||
memoization. miniAdapton is built on top of an even simpler system,
|
||||
microAdapton. Both miniAdapton and microAdapton are designed to be easy to
|
||||
understand, extend, and port to host languages other than Scheme.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public guile-irregex
|
||||
(package
|
||||
(name "guile-irregex")
|
||||
|
@ -965,7 +1037,7 @@ Guile's foreign function interface.")
|
|||
(let ((commit "607721fe1174a299e45d457acacf94eefb964071"))
|
||||
(package
|
||||
(name "guile-sqlite3")
|
||||
(version (string-append "0.0-0." (string-take commit 7)))
|
||||
(version (string-append "0.0-1." (string-take commit 7)))
|
||||
|
||||
;; XXX: This used to be available read-only at
|
||||
;; <https://www.gitorious.org/guile-sqlite3/guile-sqlite3.git/> but it
|
||||
|
@ -993,7 +1065,7 @@ Guile's foreign function interface.")
|
|||
("automake" ,automake)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("guile" ,guile-2.0)
|
||||
`(("guile" ,guile-2.2)
|
||||
("sqlite" ,sqlite)))
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
|
@ -1471,6 +1543,8 @@ is no support for parsing block and inline level HTML.")
|
|||
effective))
|
||||
(source (assoc-ref %build-inputs "source"))
|
||||
(doc (string-append out "/share/doc/scheme-bytestructures"))
|
||||
(sld-files (with-directory-excursion source
|
||||
(find-files "bytestructures/r7" "\\.exports.sld$")))
|
||||
(scm-files (filter (lambda (path)
|
||||
(not (string-prefix? "bytestructures/r7" path)))
|
||||
(with-directory-excursion source
|
||||
|
@ -1502,7 +1576,7 @@ is no support for parsing block and inline level HTML.")
|
|||
file))
|
||||
(error (format #f "Failed to compile ~s to ~s!"
|
||||
file go-file)))))
|
||||
scm-files)
|
||||
(append sld-files scm-files))
|
||||
|
||||
;; Also copy over the README.
|
||||
(install-file "README.md" doc)
|
||||
|
@ -1767,14 +1841,14 @@ HTML (via SXML) or any other format for rendering.")
|
|||
(define-public guile-sjson
|
||||
(package
|
||||
(name "guile-sjson")
|
||||
(version "0.2")
|
||||
(version "0.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://dustycloud.org/misc/sjson-" version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"09hnh2brc7ihh8dv4g5hdmdj8rs8p9l3pmlgafkx145grdg7wprx"))))
|
||||
"1mzmapln79vv10qxaggz9qwcdbag3jnrj19xx8bgkmxss8h03sv3"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
|
@ -13,8 +13,9 @@
|
|||
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
|
||||
;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
|
||||
;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
|
||||
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -155,6 +156,41 @@ APNG patch provides APNG support to libpng.")
|
|||
(sha256
|
||||
(base32 "1n2lrzjkm5jhfg2bs10q398lkwbbx742fi27zgdgx0x23zhj0ihg"))))))
|
||||
|
||||
(define-public pngcrunch
|
||||
(package
|
||||
(name "pngcrunch")
|
||||
(version "1.8.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/pmt/pngcrush/"
|
||||
version "/pngcrush-" version ".tar.xz"))
|
||||
(sha256 (base32
|
||||
"1c7m316i91jp3h1dj1ppppdv6zilm2njk1wrpqy2zj0fcll06lwd"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:make-flags '("-f" "Makefile-nolib")
|
||||
#:tests? #f ; no check target
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(substitute* "Makefile-nolib"
|
||||
(("^(PNG(INC|LIB) = )/usr/local/" line vardef)
|
||||
(string-append vardef (assoc-ref inputs "libpng") "/"))
|
||||
(("^(Z(INC|LIB) = )/usr/local/" line vardef)
|
||||
(string-append vardef (assoc-ref inputs "zlib") "/"))
|
||||
;; The Makefile is written by hand and not using $PREFIX
|
||||
(("\\$\\(DESTDIR\\)/usr/")
|
||||
(string-append (assoc-ref outputs "out") "/"))))))))
|
||||
(inputs
|
||||
`(("libpng" ,libpng)
|
||||
("zlib" , zlib)))
|
||||
(home-page "https://pmt.sourceforge.net/pngcrush")
|
||||
(synopsis "Utility to compress PNG files")
|
||||
(description "pngcrusqh is an optimizer for PNG (Portable Network Graphics)
|
||||
files. It can compress them as much as 40% losslessly.")
|
||||
(license license:zlib)))
|
||||
|
||||
(define-public libjpeg
|
||||
(package
|
||||
(name "libjpeg")
|
||||
|
@ -299,6 +335,7 @@ extracting icontainer icon files.")
|
|||
(define-public libtiff
|
||||
(package
|
||||
(name "libtiff")
|
||||
(replacement libtiff/fixed)
|
||||
(version "4.0.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -347,6 +384,19 @@ collection of tools for doing simple manipulations of TIFF images.")
|
|||
"See COPYRIGHT in the distribution."))
|
||||
(home-page "http://www.simplesystems.org/libtiff/")))
|
||||
|
||||
(define libtiff/fixed
|
||||
(package
|
||||
(inherit libtiff)
|
||||
(source
|
||||
(origin
|
||||
(inherit (package-source libtiff))
|
||||
(patches
|
||||
(append
|
||||
(origin-patches (package-source libtiff))
|
||||
(search-patches "libtiff-CVE-2017-7593.patch"
|
||||
"libtiff-CVE-2017-7594.patch"
|
||||
"libtiff-multiple-UBSAN-crashes.patch")))))))
|
||||
|
||||
(define-public libwmf
|
||||
(package
|
||||
(name "libwmf")
|
||||
|
|
|
@ -46,14 +46,14 @@
|
|||
;; The 7 release series has an incompatible API, while the 6 series is still
|
||||
;; maintained. Don't update to 7 until we've made sure that the ImageMagick
|
||||
;; users are ready for the 7-series API.
|
||||
(version "6.9.8-3")
|
||||
(version "6.9.8-4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://imagemagick/ImageMagick-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"05hk841f5fw1hh7pfmpznlwcdr68ijk3s3zwqv0g009xh17q1max"))))
|
||||
"04fb0x8zc9z11127wsnxlzg0jcgs4xwlx8fxy4jac2y3mmmlzhm6"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
|
||||
|
|
|
@ -142,14 +142,14 @@ SILC and ICB protocols via plugins.")
|
|||
(define-public weechat
|
||||
(package
|
||||
(name "weechat")
|
||||
(version "1.7.1")
|
||||
(version "1.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://weechat.org/files/src/weechat-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0c0waxrxq2v0r7981y1ajh9k78jfl223smwrj4v9c5z27iwh8ziz"))
|
||||
"05z0qmlmdm0zgkzhi6cy6snxdz37h1n5z2s460df76akjr7capxn"))
|
||||
(patches (search-patches "weechat-python.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("autoconf" ,autoconf)
|
||||
|
@ -300,14 +300,14 @@ using a mouse. It is customizable and extensible with plugins and scripts.")
|
|||
(define-public limnoria
|
||||
(package
|
||||
(name "limnoria")
|
||||
(version "2017.01.10")
|
||||
(version "2017.03.30")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "limnoria" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0va7iiwkrd5miibpaphfm2jlfsmaazbqb8izkmlnlzkqnskhz1ff"))))
|
||||
"1q0y6iglg1cbhimgjz3afws51as3shy6rd61dck7jfm25y8pi6g8"))))
|
||||
(build-system python-build-system)
|
||||
(inputs
|
||||
`(("python-pytz" ,python-pytz)
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -308,7 +308,7 @@ with a ksysguardd daemon, which may also run on a remote system.")
|
|||
(define-public qca
|
||||
(package
|
||||
(name "qca")
|
||||
(version "2.1.1")
|
||||
(version "2.1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -316,14 +316,14 @@ with a ksysguardd daemon, which may also run on a remote system.")
|
|||
"/src/qca-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"10z9icq28fww4qbzwra8d9z55ywbv74qk68nhiqfrydm21wkxplm"))))
|
||||
"0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("openssl" ,openssl)
|
||||
("qtbase" ,qtbase)))
|
||||
(home-page "http://delta.affinix.com/qca/")
|
||||
(home-page "https://userbase.kde.org/QCA")
|
||||
(synopsis "Libraries for the Qt Cryptographic Architecture")
|
||||
(description "The Qt Cryptographic Architecture (QCA) provides a
|
||||
straightforward and cross-platform API for a range of cryptographic features,
|
||||
|
|
|
@ -239,8 +239,8 @@ generator library for C++.")
|
|||
(define-public kodi
|
||||
;; We package the git version because the current released
|
||||
;; version was cut while the cmake transition was in turmoil.
|
||||
(let ((commit "749c61e01082acec745bb82888caa1dd1eaa0677")
|
||||
(revision "3"))
|
||||
(let ((commit "b8ad238aa8010063eaf7d608d139002a50075e8d")
|
||||
(revision "4"))
|
||||
(package
|
||||
(name "kodi")
|
||||
(version (string-append "18.0_alpha-" revision "-" (string-take commit 7)))
|
||||
|
@ -252,7 +252,7 @@ generator library for C++.")
|
|||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0mg22sbxvkhvd1b13xmv96k0b3lnrmjh3cd0cl0gjh17ip2v1y9k"))
|
||||
"192agb8lpbajljbnnpn7y1pk2c6bvqbcpqhlgq4pja4pdf664xzg"))
|
||||
(snippet
|
||||
'(begin
|
||||
(use-modules (guix build utils))
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#:use-module (gnu packages web)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix build-system perl)
|
||||
#:use-module ((guix licenses) #:select (gpl2 gpl3))
|
||||
#:use-module ((guix licenses) #:select (gpl2 gpl3 perl-license))
|
||||
#:use-module (guix download))
|
||||
|
||||
(define-public perl-lingua-en-findnumber
|
||||
|
@ -45,7 +45,7 @@
|
|||
(description "This module provides a regular expression for finding
|
||||
numbers in English text. It also provides functions for extracting and
|
||||
manipulating such numbers.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-lingua-en-inflect
|
||||
(package
|
||||
|
@ -68,7 +68,7 @@ manipulating such numbers.")
|
|||
words. Plural forms of all nouns, most verbs, and some adjectives are
|
||||
provided. Where appropriate, \"classical\" variants (for example: \"brother\"
|
||||
-> \"brethren\", \"dogma\" -> \"dogmata\", etc.) are also provided.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-lingua-en-inflect-number
|
||||
(package
|
||||
|
@ -90,7 +90,7 @@ provided. Where appropriate, \"classical\" variants (for example: \"brother\"
|
|||
(description "This module extends the functionality of Lingua::EN::Inflect
|
||||
with three new functions for determining plurality of a word and forcefully
|
||||
converting a word to singular or plural.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-lingua-en-inflect-phrase
|
||||
(package
|
||||
|
@ -117,7 +117,7 @@ converting a word to singular or plural.")
|
|||
(synopsis "Inflect short English phrases")
|
||||
(description "This module attempts to pluralize or singularize short
|
||||
English phrases.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-lingua-en-number-isordinal
|
||||
(package
|
||||
|
@ -141,7 +141,7 @@ English phrases.")
|
|||
(synopsis "Detect if English number is ordinal or cardinal")
|
||||
(description "This module will tell you if a number, either in words or as
|
||||
digits, is a cardinal or ordinal number.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-lingua-en-tagger
|
||||
(package
|
||||
|
@ -190,7 +190,7 @@ using a set of regular expressions.")
|
|||
(synopsis "Convert English text to numbers")
|
||||
(description "This module converts English text into numbers. It supports
|
||||
both ordinal and cardinal numbers, negative numbers, and very large numbers.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-lingua-pt-stemmer
|
||||
(package
|
||||
|
@ -210,7 +210,7 @@ both ordinal and cardinal numbers, negative numbers, and very large numbers.")
|
|||
(description "This module implements a Portuguese stemming algorithm
|
||||
proposed in the paper A Stemming Algorithm for the Portuguese Language by
|
||||
Moreira, V. and Huyck, C.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-lingua-stem
|
||||
(package
|
||||
|
@ -240,7 +240,7 @@ Moreira, V. and Huyck, C.")
|
|||
(synopsis "Stemming of words in various languages")
|
||||
(description "This routine applies stemming algorithms to its parameters,
|
||||
returning the stemmed words as appropriate to the selected locale.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-lingua-stem-fr
|
||||
(package
|
||||
|
@ -259,7 +259,7 @@ returning the stemmed words as appropriate to the selected locale.")
|
|||
(synopsis "Porter's stemming algorithm for French")
|
||||
(description "This module uses a modified version of the Porter Stemming
|
||||
Algorithm to return a stemmed French word.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-lingua-stem-it
|
||||
(package
|
||||
|
@ -278,7 +278,7 @@ Algorithm to return a stemmed French word.")
|
|||
(synopsis "Porter's stemming algorithm for Italian")
|
||||
(description "This module applies the Porter Stemming Algorithm to its
|
||||
parameters, returning the stemmed Italian word.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-lingua-stem-ru
|
||||
(package
|
||||
|
@ -297,7 +297,7 @@ parameters, returning the stemmed Italian word.")
|
|||
(synopsis "Porter's stemming algorithm for Russian")
|
||||
(description "This module applies the Porter Stemming Algorithm to its
|
||||
parameters, returning the stemmed Russian (KOI8-R only) word.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-lingua-stem-snowball-da
|
||||
(package
|
||||
|
@ -337,7 +337,7 @@ Lingua::Stem::Snowball::Se.")
|
|||
(synopsis "Porters stemming algorithm for Norwegian")
|
||||
(description "Lingua::Stem::Snowball::No is a perl port of the norwegian
|
||||
stemmer at http://snowball.tartarus.org.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-snowball-swedish
|
||||
(package
|
||||
|
@ -357,7 +357,7 @@ stemmer at http://snowball.tartarus.org.")
|
|||
(synopsis "Porters stemming algorithm for Swedish")
|
||||
(description "Lingua::Stem::Snowball::Se is a perl port of the swedish
|
||||
stemmer at http://snowball.sourceforge.net.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-string-toidentifier-en
|
||||
(package
|
||||
|
@ -383,7 +383,7 @@ converting an arbitrary string into a readable representation using the ASCII
|
|||
subset of \"\\w\" for use as an identifier in a computer program. The intent
|
||||
is to make unique identifier names from which the content of the original
|
||||
string can be easily inferred by a human just by reading the identifier.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-text-german
|
||||
(package
|
||||
|
@ -402,4 +402,4 @@ string can be easily inferred by a human just by reading the identifier.")
|
|||
(synopsis "German grundform reduction")
|
||||
(description "This module is a rather incomplete implementation of work
|
||||
done by Gudrun Putze-Meier.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
(define-public less
|
||||
(package
|
||||
(name "less")
|
||||
(version "481")
|
||||
(version "487")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -34,7 +34,7 @@
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"19fxj0h10y5bhr3a1xa7kqvnwl44db3sdypz8jxl1q79yln8z8rz"))))
|
||||
"01i7n6jaxwmww3pasy3hg38zc6x7jw0w05mqqvh6caqbrdaq9p7k"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("ncurses" ,ncurses)))
|
||||
(home-page "https://www.gnu.org/software/less/")
|
||||
|
|
|
@ -192,7 +192,7 @@ Currently supported event loops are EV, Event, Glib/Gtk2, Tk, Qt,
|
|||
@code{Event::Lib}, Irssi, @code{IO::Async} and POE (and thus also WxWidgets
|
||||
and Prima). It also comes with a very fast Pure Perl event loop that does
|
||||
not rely on XS.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-ev
|
||||
(package
|
||||
|
@ -233,4 +233,4 @@ not rely on XS.")
|
|||
"This module provides an interface to @code{libev}, a high performance
|
||||
full-featured event loop. It can be used through the @code{AnyEvent} module
|
||||
and still be faster than other event loops currently supported in Perl.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015 Joshua S. Grant <jgrant@parenthetical.io>
|
||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -19,27 +20,27 @@
|
|||
|
||||
(define-module (gnu packages libffcall)
|
||||
#:use-module ((guix licenses) #:prefix l:)
|
||||
#:use-module (guix utils) ; string-replace-substring
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix cvs-download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system gnu))
|
||||
|
||||
(define-public libffcall
|
||||
(package
|
||||
(name "libffcall")
|
||||
(version "1.10+cvs-2015-01-15")
|
||||
(version "1.12")
|
||||
(source
|
||||
(origin
|
||||
(method cvs-fetch)
|
||||
(uri (cvs-reference
|
||||
(root-directory
|
||||
":pserver:anonymous@cvs.savannah.gnu.org:/sources/libffcall")
|
||||
(module "ffcall")
|
||||
(revision "2015-01-15")))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.savannah.gnu.org/r/libffcall.git")
|
||||
(commit (string-append
|
||||
"ffcall-" (string-replace-substring version "." "-")))))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"1lwdskc2w4rr98x9flr2726lmj4190l16r0izg7gqxy50801wwgd"))))
|
||||
"0p7gg5k4ifcqpmrmdfmr2r4x909cn35g87iff539p6i8891fdfxf"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments `(#:parallel-build? #f))
|
||||
(synopsis "Foreign function calls from interpreters")
|
||||
|
|
|
@ -1,81 +0,0 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages links)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages libevent)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu))
|
||||
|
||||
(define-public links
|
||||
(package
|
||||
(name "links")
|
||||
(version "2.14")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://links.twibright.com/download/"
|
||||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "1f24y83wa1vzzjq5kp857gjqdpnmf8pb29yw7fam0m8wxxw0c3gp"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; The tarball uses a very old version of autconf. It doesn't
|
||||
;; understand extra flags like `--enable-fast-install', so
|
||||
;; we need to invoke it with just what it understands.
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
;; 'configure' doesn't understand '--host'.
|
||||
,@(if (%current-target-system)
|
||||
`((setenv "CHOST" ,(%current-target-system)))
|
||||
'())
|
||||
(setenv "CONFIG_SHELL" (which "bash"))
|
||||
(zero?
|
||||
(system* "./configure"
|
||||
(string-append "--prefix=" out)
|
||||
"--enable-graphics"))))))))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(inputs `(("zlib" ,zlib)
|
||||
("openssl" ,openssl)
|
||||
("libjpeg" ,libjpeg)
|
||||
("libtiff" ,libtiff)
|
||||
("libevent" ,libevent)
|
||||
("libpng" ,libpng)
|
||||
("libxt" ,libxt)))
|
||||
(synopsis "Text and graphics mode web browser")
|
||||
(description "Links is a graphics and text mode web browser, with many
|
||||
features including, tables, builtin image display, bookmarks, SSL and more.")
|
||||
(home-page "http://links.twibright.com")
|
||||
;; The distribution contains a copy of GPLv2
|
||||
;; However, the copyright notices simply say:
|
||||
;; "This file is a part of the Links program, released under GPL."
|
||||
;; Therefore, under the provisions of Section 9, we can choose
|
||||
;; any version ever published by the FSF.
|
||||
;; One file (https.c) contains an exception permitting
|
||||
;; linking of the program with openssl.
|
||||
(license license:gpl1+)))
|
|
@ -80,6 +80,7 @@
|
|||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages rrdtool)
|
||||
#:use-module (gnu packages samba)
|
||||
#:use-module (gnu packages slang)
|
||||
#:use-module (gnu packages storage)
|
||||
#:use-module (gnu packages texinfo)
|
||||
|
@ -353,8 +354,8 @@ It has been modified to remove all non-free binary blobs.")
|
|||
|
||||
(define %intel-compatible-systems '("x86_64-linux" "i686-linux"))
|
||||
|
||||
(define %linux-libre-version "4.10.13")
|
||||
(define %linux-libre-hash "0sl3w4id3amahv42xg2ac0lqhxn5dih2vm7wyxnfja4c3g4hshn4")
|
||||
(define %linux-libre-version "4.11")
|
||||
(define %linux-libre-hash "0j1bzzq9iq5i1zm7gnig8v0clr8wq303kvcdsaifc0r0ggz1mx1n")
|
||||
|
||||
(define-public linux-libre
|
||||
(make-linux-libre %linux-libre-version
|
||||
|
@ -363,14 +364,14 @@ It has been modified to remove all non-free binary blobs.")
|
|||
#:configuration-file kernel-config))
|
||||
|
||||
(define-public linux-libre-4.9
|
||||
(make-linux-libre "4.9.25"
|
||||
"15vcphpz40n75jwhbpbwiqvgxsdn05n6nbfg5cksyy24f9fpd35k"
|
||||
(make-linux-libre "4.9.27"
|
||||
"1b39zijjkv21kya359y4g88w5ff110v95pvc4wfvc83dvik9hny5"
|
||||
%intel-compatible-systems
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
(define-public linux-libre-4.4
|
||||
(make-linux-libre "4.4.64"
|
||||
"02fvsklimzgkhsjg3i6mjhf09b4kvgwr2cg2nak5li3fpjmw1y35"
|
||||
(make-linux-libre "4.4.67"
|
||||
"1nadmrd26llc17ipig7bx7rf2gwns94g86a3ilcvgdk17hq5riss"
|
||||
%intel-compatible-systems
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
|
@ -467,7 +468,7 @@ at login. Local and dynamic reconfiguration are its key features.")
|
|||
(define-public psmisc
|
||||
(package
|
||||
(name "psmisc")
|
||||
(version "22.20")
|
||||
(version "22.21")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -475,10 +476,10 @@ at login. Local and dynamic reconfiguration are its key features.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"052mfraykmxnavpi8s78aljx8w87hyvpx8mvzsgpjsjz73i28wmi"))))
|
||||
"0nhlm1vrrwn4a845p6y4nnnb4liq70n74zbdd5dq844jc6nkqclp"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("ncurses" ,ncurses)))
|
||||
(home-page "http://psmisc.sourceforge.net/")
|
||||
(home-page "https://gitlab.com/psmisc/psmisc")
|
||||
(synopsis
|
||||
"Small utilities that use the proc file system")
|
||||
(description
|
||||
|
@ -646,7 +647,7 @@ slabtop, and skill.")
|
|||
(define-public e2fsprogs
|
||||
(package
|
||||
(name "e2fsprogs")
|
||||
(version "1.42.13")
|
||||
(version "1.43.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -655,31 +656,20 @@ slabtop, and skill.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ix0b83zgw5n0p2grh2961c6796m92yr2jqc2sbr23x3lfsp8r71"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(substitute* "MCONFIG.in"
|
||||
(("INSTALL_SYMLINK = /bin/sh")
|
||||
"INSTALL_SYMLINK = sh"))
|
||||
|
||||
;; Do not include a timestamp in libext2fs.info.gz.
|
||||
(substitute* "doc/Makefile.in"
|
||||
(("gzip -9")
|
||||
"gzip -9n"))))))
|
||||
"092absr4vrlqrkdf9nwh4ykj40ab6hhwrkdr6sjsccd54c8z5csl"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("util-linux" ,util-linux)))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)
|
||||
("texinfo" ,texinfo))) ;for the libext2fs Info manual
|
||||
("texinfo" ,texinfo) ;for the libext2fs Info manual
|
||||
|
||||
;; For tests.
|
||||
("perl" ,perl)
|
||||
("procps" ,procps)))
|
||||
(arguments
|
||||
'(;; Parallel building reliably yields a failure like this:
|
||||
;; "make[2]: *** No rule to make target '../lib/libss.so', needed by
|
||||
;; 'debugfs'. Stop."
|
||||
#:parallel-build? #f
|
||||
;; util-linux is the preferred source for some of the libraries and
|
||||
'(;; util-linux is the preferred source for some of the libraries and
|
||||
;; commands, so disable them (see, e.g.,
|
||||
;; <http://git.buildroot.net/buildroot/commit/?id=e1ffc2f791b33633>.)
|
||||
#:configure-flags '("--disable-libblkid"
|
||||
#:configure-flags (list "--disable-libblkid"
|
||||
"--disable-libuuid" "--disable-uuidd"
|
||||
"--disable-fsck"
|
||||
|
||||
|
@ -688,25 +678,29 @@ slabtop, and skill.")
|
|||
;; smaller and is preserved across copies.
|
||||
"--enable-symlink-install"
|
||||
|
||||
(string-append "LDFLAGS=-Wl,-rpath="
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib")
|
||||
|
||||
;; Install libext2fs et al.
|
||||
"--enable-elf-shlibs")
|
||||
|
||||
#:make-flags (list (string-append "LDFLAGS=-Wl,-rpath="
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib"))
|
||||
|
||||
#:phases (alist-cons-before
|
||||
'configure 'patch-shells
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-shells
|
||||
(lambda _
|
||||
(substitute* "configure"
|
||||
(("/bin/sh (.*)parse-types.sh" _ dir)
|
||||
(string-append (which "sh") " " dir
|
||||
"parse-types.sh")))
|
||||
(substitute* "MCONFIG.in"
|
||||
(("INSTALL_SYMLINK = /bin/sh")
|
||||
"INSTALL_SYMLINK = sh"))
|
||||
(substitute* (find-files "." "^Makefile.in$")
|
||||
(("#!/bin/sh")
|
||||
(string-append "#!" (which "sh")))))
|
||||
(alist-cons-after
|
||||
'install 'install-libs
|
||||
(string-append "#!" (which "sh"))))
|
||||
#t))
|
||||
(add-after 'install 'install-libs
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(lib (string-append out "/lib")))
|
||||
|
@ -721,13 +715,7 @@ slabtop, and skill.")
|
|||
(for-each (lambda (file)
|
||||
(chmod file #o666))
|
||||
archives)
|
||||
#t))))
|
||||
%standard-phases))
|
||||
|
||||
;; FIXME: Tests work by comparing the stdout/stderr of programs, that
|
||||
;; they fail because we get an extra line that says "Can't check if
|
||||
;; file system is mounted due to missing mtab file".
|
||||
#:tests? #f))
|
||||
#t))))))))
|
||||
(home-page "http://e2fsprogs.sourceforge.net/")
|
||||
(synopsis "Creating and checking ext2/ext3/ext4 file systems")
|
||||
(description
|
||||
|
@ -1697,7 +1685,7 @@ system.")
|
|||
("bzip2" ,bzip2)
|
||||
("pam" ,linux-pam)))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(home-page "ftp://ftp.kernel.org/pub/linux/utils/kbd/")
|
||||
(home-page "http://kbd-project.org/")
|
||||
(synopsis "Linux keyboard utilities and keyboard maps")
|
||||
(description
|
||||
"This package contains keytable files and keyboard utilities compatible
|
||||
|
@ -1820,14 +1808,14 @@ time.")
|
|||
(define-public lvm2
|
||||
(package
|
||||
(name "lvm2")
|
||||
(version "2.02.168")
|
||||
(version "2.02.171")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://sources.redhat.com/pub/lvm2/releases/LVM2."
|
||||
version ".tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03b62hcsj9z37ckd8c21wwpm07s9zblq7grfh58yzcs1vp6x38r3"))
|
||||
"0r4r9fsvpj9hjmf0zz7h4prz12r6y16jhjhsvk1sbfpsl88sf5dq"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -1883,7 +1871,7 @@ time.")
|
|||
|
||||
;; The tests use 'mknod', which requires root access.
|
||||
#:tests? #f))
|
||||
(home-page "http://sourceware.org/lvm2/")
|
||||
(home-page "https://sourceware.org/lvm2/")
|
||||
(synopsis "Logical volume management for Linux")
|
||||
(description
|
||||
"LVM2 is the logical volume management tool set for Linux-based systems.
|
||||
|
@ -2286,14 +2274,14 @@ thanks to the use of namespaces.")
|
|||
(define-public hdparm
|
||||
(package
|
||||
(name "hdparm")
|
||||
(version "9.51")
|
||||
(version "9.52")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/" name "/" name "/"
|
||||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"14ax5lyzhigx58ing7adbfyzisv0fqajbmzphg149rnb3s4xiyhs"))))
|
||||
"1djgxhfadd865dcrl6dp7dvjxpaisy7mk17mbdbglwg24ga9qhn3"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags (let ((out (assoc-ref %outputs "out")))
|
||||
|
@ -2699,9 +2687,7 @@ Linux Device Mapper multipathing driver:
|
|||
(method url-fetch)
|
||||
(uri (list
|
||||
(string-append "mirror://debian/pool/main/liba/libaio/"
|
||||
name "_" version ".orig.tar.gz")
|
||||
(string-append "https://fedorahosted.org/releases/l/i/libaio/"
|
||||
name "-" version ".tar.gz")))
|
||||
name "_" version ".orig.tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0zjzfkwd1kdvq6zpawhzisv7qbq1ffs343i5fs9p498pcf7046g0"))))
|
||||
|
@ -3658,7 +3644,7 @@ Light is the successor of lightscript.")
|
|||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(delete 'configure) ; no configure script
|
||||
(add-before 'build 'setenv
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
|
@ -3673,10 +3659,14 @@ Light is the successor of lightscript.")
|
|||
(setenv "TLP_SHCPL"
|
||||
(string-append out "/share/bash-completion/completions"))
|
||||
(setenv "TLP_MAN" (string-append out "/share/man")))))
|
||||
(delete 'check)
|
||||
(delete 'check) ; no tests
|
||||
(add-before 'install 'fix-installation
|
||||
(lambda _
|
||||
;; Stop the Makefile from trying to create system directories.
|
||||
(substitute* "Makefile" (("\\[ -f \\$\\(_CONF\\) \\]") "#"))))
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(system "make install-tlp install-man")))
|
||||
(zero? (system* "make" "install-tlp" "install-man"))))
|
||||
(add-after 'install 'wrap
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((bin (string-append (assoc-ref outputs "out") "/bin"))
|
||||
|
@ -3793,3 +3783,127 @@ programming interface to the in-kernel nf_tables subsystem. The library
|
|||
libnftnl has been previously known as libnftables. This library is currently
|
||||
used by nftables.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public proot
|
||||
(package
|
||||
(name "proot")
|
||||
(version "5.1.0")
|
||||
(home-page "https://github.com/proot-me/PRoot")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append home-page "/archive/v" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"11h30i83vdhc3khlj6hrh3a21sbmmz8nhfv09vkf6b9bcs1biz2h"))
|
||||
(patches (search-patches "proot-test-fhs.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:make-flags '("-C" "src")
|
||||
|
||||
#:phases (modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-before 'build 'set-shell-file-name
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* (find-files "src" "\\.[ch]$")
|
||||
(("\"/bin/sh\"")
|
||||
(string-append "\""
|
||||
(assoc-ref inputs "bash")
|
||||
"/bin/sh\"")))
|
||||
#t))
|
||||
(add-before 'check 'fix-fhs-assumptions-in-tests
|
||||
(lambda _
|
||||
(substitute* "tests/test-c6b77b77.mk"
|
||||
(("/bin/bash") (which "bash"))
|
||||
(("/usr/bin/test") (which "test")))
|
||||
(substitute* '("tests/test-16573e73.c")
|
||||
(("/bin/([a-z-]+)" _ program)
|
||||
(which program)))
|
||||
|
||||
(substitute* (find-files "tests" "\\.sh$")
|
||||
;; Some of the tests try to "bind-mount" /bin/true.
|
||||
(("-b /bin/true:")
|
||||
(string-append "-b " (which "true") ":"))
|
||||
;; Likewise for /bin.
|
||||
(("-b /bin:") "-b /gnu:")
|
||||
;; Others try to run /bin/sh.
|
||||
(("/bin/sh") (which "sh"))
|
||||
;; Others assume /etc/fstab exists.
|
||||
(("/etc/fstab") "/etc/passwd"))
|
||||
|
||||
(substitute* "tests/GNUmakefile"
|
||||
(("-b /bin:") "-b /gnu:"))
|
||||
|
||||
;; XXX: This test fails in an obscure corner case, just
|
||||
;; skip it.
|
||||
(delete-file "tests/test-kkkkkkkk.c")
|
||||
|
||||
#t))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(let ((n (parallel-job-count)))
|
||||
;; For some reason we get lots of segfaults with
|
||||
;; seccomp support (x86_64, Linux-libre 4.11.0).
|
||||
(setenv "PROOT_NO_SECCOMP" "1")
|
||||
|
||||
;; Most of the tests expect "/bin" to be in $PATH so
|
||||
;; they can run things that live in $ROOTFS/bin.
|
||||
(setenv "PATH"
|
||||
(string-append (getenv "PATH") ":/bin"))
|
||||
|
||||
(zero? (system* "make" "check" "-C" "tests"
|
||||
;;"V=1"
|
||||
"-j" (number->string n))))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; The 'install' rule does nearly nothing.
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(and (zero?
|
||||
;; TODO: 'make install-care' (does not even
|
||||
;; build currently.)
|
||||
(system* "make" "-C" "src" "install"
|
||||
(string-append "PREFIX=" out)))
|
||||
(begin
|
||||
(install-file "doc/proot/man.1"
|
||||
(string-append out "/share"
|
||||
"/man/man1"))
|
||||
#t))))))))
|
||||
(native-inputs `(("which" ,which)
|
||||
|
||||
;; For 'mcookie', used by some of the tests.
|
||||
("util-linux" ,util-linux)))
|
||||
(inputs `(("talloc" ,talloc)))
|
||||
(synopsis "Unprivileged chroot, bind mount, and binfmt_misc")
|
||||
(description
|
||||
"PRoot is a user-space implementation of @code{chroot}, @code{mount --bind},
|
||||
and @code{binfmt_misc}. This means that users don't need any privileges or
|
||||
setup to do things like using an arbitrary directory as the new root
|
||||
filesystem, making files accessible somewhere else in the file system
|
||||
hierarchy, or executing programs built for another CPU architecture
|
||||
transparently through QEMU user-mode. Also, developers can use PRoot as a
|
||||
generic process instrumentation engine thanks to its extension mechanism.
|
||||
Technically PRoot relies on @code{ptrace}, an unprivileged system-call
|
||||
available in the kernel Linux.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public proot-static
|
||||
(package
|
||||
(inherit proot)
|
||||
(name "proot-static")
|
||||
(synopsis
|
||||
"Unprivileged chroot, bind mount, and binfmt_misc (statically linked)")
|
||||
(inputs `(("talloc" ,talloc/static)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments proot)
|
||||
((#:make-flags flags)
|
||||
`(cons "LDFLAGS = -ltalloc -static -static-libgcc" ,flags))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'strip 'remove-store-references
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out")))
|
||||
(with-directory-excursion out
|
||||
(remove-store-references "bin/proot")
|
||||
#t))))))
|
||||
((#:allowed-references _ '("out"))
|
||||
'("out"))))))
|
||||
|
|
|
@ -283,7 +283,10 @@ an interpreter, a compiler, a debugger, and much more.")
|
|||
("texlive" ,texlive)
|
||||
("texinfo" ,texinfo)))
|
||||
(arguments
|
||||
'(#:phases
|
||||
'(#:modules ((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(srfi srfi-1))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-before 'build 'patch-unix-tool-paths
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
;;; Copyright © 2015, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
|
||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -218,6 +219,29 @@ code analysis tools.")
|
|||
"1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"
|
||||
#:patches '("clang-3.8-libc-search-path.patch")))
|
||||
|
||||
(define-public llvm-3.9.1
|
||||
(package (inherit llvm)
|
||||
(name "llvm")
|
||||
(version "3.9.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://llvm.org/releases/"
|
||||
version "/llvm-" version ".src.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"))))))
|
||||
|
||||
(define-public clang-runtime-3.9.1
|
||||
(clang-runtime-from-llvm
|
||||
llvm-3.9.1
|
||||
"16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk"))
|
||||
|
||||
(define-public clang-3.9.1
|
||||
(clang-from-llvm llvm-3.9.1 clang-runtime-3.9.1
|
||||
"0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"
|
||||
#:patches '()))
|
||||
|
||||
(define-public llvm-3.7
|
||||
(package (inherit llvm)
|
||||
(version "3.7.1")
|
||||
|
@ -268,6 +292,8 @@ code analysis tools.")
|
|||
(method url-fetch)
|
||||
(uri (string-append "http://llvm.org/releases/"
|
||||
version "/llvm-" version ".src.tar.xz"))
|
||||
(patches
|
||||
(search-patches "llvm-3.5-fix-clang-build-with-gcc5.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4"))))))
|
||||
|
|
|
@ -24,8 +24,10 @@
|
|||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages autotools))
|
||||
|
||||
(define-public log4cpp
|
||||
|
@ -90,3 +92,27 @@ helper macros. You can log a message by simply streaming things to log at a
|
|||
particular severity level. It allows logging to be controlled from the
|
||||
command line.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public tailon
|
||||
(package
|
||||
(name "tailon")
|
||||
(version "1.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri name version))
|
||||
(sha256
|
||||
(base32
|
||||
"08clrwpfdxcv2z2b5ardpmim4alahbw4l7631dhw62xhbcf6wjzz"))))
|
||||
(build-system python-build-system)
|
||||
(inputs
|
||||
`(("python-pyyaml" ,python-pyyaml)
|
||||
("python-sockjs-tornado" ,python-sockjs-tornado)
|
||||
("python-tornado" ,python-tornado)))
|
||||
(home-page "https://tailon.readthedocs.io/")
|
||||
(synopsis
|
||||
"Webapp for looking at and searching through log files")
|
||||
(description
|
||||
"Tailon provides a web interface around the tail, grep, awk and sed
|
||||
commands, displaying the results via a web interface.")
|
||||
(license license:bsd-3)))
|
||||
|
|
|
@ -162,6 +162,7 @@ toolkit. It allows users to monitor and control of running processes.")
|
|||
(uri (string-append "mirror://sourceforge/lxde/LXTerminal"
|
||||
"%20%28terminal%20emulator%29/LXTerminal%20"
|
||||
version "/" name "-" version ".tar.xz"))
|
||||
(patches (search-patches "lxterminal-CVE-2016-10369.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1yf76s15zvfw0h42b0ay1slpq47khgjmcry8ki2z812zar9lchia"))))
|
||||
|
@ -288,11 +289,26 @@ menu spec-compliant desktop menus for LXDE.")
|
|||
(base32
|
||||
"0mj84fa3f4ak1jjslrwc2q3ci9zxrxpciggviza9bjb0168brn8w"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
(add-before 'configure 'set-lxsession
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Set the right file name for 'lxsession'.
|
||||
(let ((lxsession (assoc-ref inputs "lxsession")))
|
||||
(substitute* "startlxde.in"
|
||||
(("^exec .*/bin/lxsession")
|
||||
(string-append "exec " lxsession
|
||||
"/bin/lxsession")))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("intltool" ,intltool)
|
||||
("lxmenu-data" ,lxmenu-data)
|
||||
("lxde-icon-theme" ,lxde-icon-theme)))
|
||||
(inputs
|
||||
`(("lxsession" ,lxsession)
|
||||
;; ("lxlock" ,lxlock) ;for 'lxde-screenlock.desktop'
|
||||
))
|
||||
(synopsis "Common files of the LXDE Desktop")
|
||||
(description
|
||||
"Lxde-common provides common files of the LXDE Desktop.")
|
||||
|
|
|
@ -1,91 +0,0 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; 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 lynx)
|
||||
#:use-module ((guix licenses) #:select (gpl2))
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages libidn)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages zip)
|
||||
#:use-module (gnu packages compression))
|
||||
|
||||
(define-public lynx
|
||||
(package
|
||||
(name "lynx")
|
||||
(version "2.8.9dev.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://invisible-mirror.net/archives/lynx/tarballs"
|
||||
"/lynx" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1cqm1i7d209brkrpzaqqf2x951ra3l67dw8x9yg10vz7rpr9441a"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("pkg-config" ,pkg-config)
|
||||
("perl" ,perl)))
|
||||
(inputs `(("ncurses" ,ncurses)
|
||||
("libidn" ,libidn)
|
||||
("gnutls" ,gnutls)
|
||||
("libgcrypt" ,libgcrypt)
|
||||
("unzip" ,unzip)
|
||||
("zlib" ,zlib)
|
||||
("gzip" ,gzip)
|
||||
("bzip2" ,bzip2)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(let ((gnutls (assoc-ref %build-inputs "gnutls")))
|
||||
`("--with-pkg-config"
|
||||
"--with-screen=ncurses"
|
||||
"--with-zlib"
|
||||
"--with-bzlib"
|
||||
,(string-append "--with-gnutls=" gnutls)
|
||||
;; "--with-socks5" ; XXX TODO
|
||||
"--enable-widec"
|
||||
"--enable-ascii-ctypes"
|
||||
"--enable-local-docs"
|
||||
"--enable-htmlized-cfg"
|
||||
"--enable-gzip-help"
|
||||
"--enable-nls"
|
||||
"--enable-ipv6"))
|
||||
#:tests? #f ; no check target
|
||||
#:phases (alist-replace
|
||||
'install
|
||||
(lambda* (#:key (make-flags '()) #:allow-other-keys)
|
||||
(zero? (apply system* "make" "install-full" make-flags)))
|
||||
%standard-phases)))
|
||||
(synopsis "Text Web Browser")
|
||||
(description
|
||||
"Lynx is a fully-featured World Wide Web (WWW) client for users running
|
||||
cursor-addressable, character-cell display devices. It will display Hypertext
|
||||
Markup Language (HTML) documents containing links to files on the local
|
||||
system, as well as files on remote systems running http, gopher, ftp, wais,
|
||||
nntp, finger, or cso/ph/qi servers. Lynx can be used to access information on
|
||||
the WWW, or to build information systems intended primarily for local
|
||||
access.")
|
||||
(home-page "http://lynx.isc.org/")
|
||||
(license gpl2)))
|
||||
|
||||
;;; lynx.scm ends here
|
|
@ -274,6 +274,9 @@ networks) based on simulation of (stochastic) flow in graphs.")
|
|||
algorithm.")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public ocaml4.01-mcl
|
||||
(package-with-ocaml4.01 ocaml-mcl))
|
||||
|
||||
(define-public randomjungle
|
||||
(package
|
||||
(name "randomjungle")
|
||||
|
|
|
@ -104,7 +104,7 @@
|
|||
#:select (gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+
|
||||
non-copyleft (expat . license:expat) bsd-3
|
||||
public-domain bsd-4 isc (openssl . license:openssl)
|
||||
bsd-2 x11-style agpl3 asl2.0))
|
||||
bsd-2 x11-style agpl3 asl2.0 perl-license))
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
|
@ -837,14 +837,14 @@ useful features.")
|
|||
(define-public libetpan
|
||||
(package
|
||||
(name "libetpan")
|
||||
(version "1.7.2")
|
||||
(version "1.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/dinhviethoa/" name
|
||||
"/archive/" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "081ixgj3skglq9i7v0jb835lmfx21zi4i5b7997igwr0lj174y9j"))))
|
||||
(base32 "1sxnaglp5hb0z78sgnfzva4x8m4flqhicvm1dz0krkxdmfsafrsf"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("autoconf" ,(autoconf-wrapper))
|
||||
("automake" ,automake)
|
||||
|
@ -875,7 +875,7 @@ useful features.")
|
|||
framework for different kinds of mail access: IMAP, SMTP, POP and NNTP. It
|
||||
provides an API for C language. It's the low-level API used by MailCore and
|
||||
MailCore 2.")
|
||||
(license (non-copyleft "file://COPYING"))))
|
||||
(license bsd-3)))
|
||||
|
||||
(define-public compface
|
||||
(package
|
||||
|
@ -1277,7 +1277,7 @@ mailboxes. Currently Maildir and IMAP are supported types.")
|
|||
(synopsis "Interface to mail representations")
|
||||
(description "Email::Abstract provides module writers with the ability to
|
||||
write simple, representation-independent mail handling code.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-email-address
|
||||
(package
|
||||
|
@ -1297,7 +1297,7 @@ write simple, representation-independent mail handling code.")
|
|||
(description "Email::Address implements a regex-based RFC 2822 parser that
|
||||
locates email addresses in strings and returns a list of Email::Address
|
||||
objects found. Alternatively you may construct objects manually.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-email-date-format
|
||||
(package
|
||||
|
@ -1316,7 +1316,7 @@ objects found. Alternatively you may construct objects manually.")
|
|||
(synopsis "Produce RFC 2822 date strings")
|
||||
(description "Email::Date::Format provides a means for generating an RFC
|
||||
2822 compliant datetime string.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-email-messageid
|
||||
(package
|
||||
|
@ -1335,7 +1335,7 @@ objects found. Alternatively you may construct objects manually.")
|
|||
(synopsis "Generate world unique message-ids")
|
||||
(description "Email::MessageID generates recommended message-ids to
|
||||
identify a message uniquely.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-email-mime
|
||||
(package
|
||||
|
@ -1363,7 +1363,7 @@ identify a message uniquely.")
|
|||
handle MIME encoded messages. It takes a message as a string, splits it up
|
||||
into its constituent parts, and allows you access to various parts of the
|
||||
message. Headers are decoded from MIME encoding.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-email-mime-contenttype
|
||||
(package
|
||||
|
@ -1384,7 +1384,7 @@ message. Headers are decoded from MIME encoding.")
|
|||
(synopsis "Parse MIME Content-Type headers")
|
||||
(description "Email::MIME::ContentType parses a MIME Content-Type
|
||||
header.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-email-mime-encodings
|
||||
(package
|
||||
|
@ -1404,7 +1404,7 @@ header.")
|
|||
(home-page "http://search.cpan.org/dist/Email-MIME-Encodings")
|
||||
(synopsis "Unified interface to MIME encoding and decoding")
|
||||
(description "This module wraps MIME::Base64 and MIME::QuotedPrint.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-email-sender
|
||||
(package
|
||||
|
@ -1436,7 +1436,7 @@ header.")
|
|||
(synopsis "Perl library for sending email")
|
||||
(description "Email::Sender replaces the old and sometimes problematic
|
||||
Email::Send library.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public perl-email-simple
|
||||
(package
|
||||
|
@ -1457,7 +1457,7 @@ Email::Send library.")
|
|||
(synopsis "Parsing of RFC 2822 messages")
|
||||
(description "Email::Simple provides simple parsing of RFC 2822 message
|
||||
format and headers.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public libesmtp
|
||||
(package
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
#:use-module (gnu packages gawk)
|
||||
#:use-module (gnu packages groff)
|
||||
#:use-module (gnu packages less)
|
||||
#:use-module (gnu packages lynx)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages linux))
|
||||
|
@ -134,7 +133,7 @@ the traditional flat-text whatis databases.")
|
|||
(define-public man-pages
|
||||
(package
|
||||
(name "man-pages")
|
||||
(version "4.10")
|
||||
(version "4.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -147,7 +146,7 @@ the traditional flat-text whatis databases.")
|
|||
"man-pages-" version ".tar.xz")))
|
||||
(sha256
|
||||
(base32
|
||||
"1yk3ibmbc1wamw798lqw8lh203xnrjddy8wdk5d3hifmj71xz5bk"))))
|
||||
"097m0gsbaz0gf9ir4lmph3h5jj6wmydk1rglfz82dysybx4q1pmd"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (alist-delete 'configure %standard-phases)
|
||||
|
|
|
@ -311,6 +311,9 @@ numbers.")
|
|||
the OCaml language.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public ocaml4.01-gsl
|
||||
(package-with-ocaml4.01 ocaml-gsl))
|
||||
|
||||
(define-public glpk
|
||||
(package
|
||||
(name "glpk")
|
||||
|
|
|
@ -0,0 +1,97 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages mes)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages commencement)
|
||||
#:use-module (gnu packages cross-base)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages package-management)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module (guix packages))
|
||||
|
||||
(define-public nyacc
|
||||
(package
|
||||
(name "nyacc")
|
||||
(version "0.78.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/nyacc/"
|
||||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xrnl2hl9rpl50n8cihvclcd951zj640fj5kpi3d6ihwcqjcdi0a"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("guile" ,guile-2.2)))
|
||||
(synopsis "LALR(1) Parser Generator in Guile")
|
||||
(description
|
||||
"NYACC is an LALR(1) parser generator implemented in Guile.
|
||||
The syntax and nomenclature should be considered not stable. It comes with
|
||||
extensive examples, including parsers for the Javascript and C99 languages.")
|
||||
(home-page "https://savannah.nongnu.org/projects/nyacc")
|
||||
(license (list gpl3+ lgpl3+))))
|
||||
|
||||
(define-public mes
|
||||
(let ((commit "a437c173b9da1949ad966fd50dd4f26e522a910a")
|
||||
(revision "0")
|
||||
(triplet "i686-unknown-linux-gnu"))
|
||||
(package
|
||||
(name "mes")
|
||||
(version (string-append "0.5-" revision "." (string-take commit 7)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/janneke/mes")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version))
|
||||
;; TODO: Unbundle nyacc.
|
||||
(sha256
|
||||
(base32 "1ynr0hc0k15307sgzv09k3y5rvy46h0wbh7zcblx1f9v7y8k90zv"))))
|
||||
(build-system gnu-build-system)
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(native-inputs
|
||||
`(("guile" ,guile-2.2)
|
||||
;; Use cross-compiler rather than #:system "i686-linux" to get
|
||||
;; MesCC 64 bit .go files installed ready for use with Guile.
|
||||
("i686-linux-binutils" ,(cross-binutils triplet))
|
||||
("i686-linux-gcc" ,(let ((triplet triplet)) (cross-gcc triplet)))
|
||||
("perl" ,perl))) ;build-aux/gitlog-to-changelog
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'install 'generate-changelog
|
||||
(lambda _
|
||||
(with-output-to-file "ChangeLog"
|
||||
(lambda ()
|
||||
(display "Please run
|
||||
build-aux/gitlog-to-changelog --srcdir=<git-checkout> > ChangeLog\n")))
|
||||
#t)))))
|
||||
(synopsis "Maxwell Equations of Software")
|
||||
(description
|
||||
"Mes aims to create full source bootstrapping for GuixSD. It
|
||||
consists of a mutual self-hosting [close to Guile-] Scheme interpreter
|
||||
prototype in C and a Nyacc-based C compiler in [Guile] Scheme.")
|
||||
(home-page "https://gitlab.com/janneke/mes")
|
||||
(license gpl3+))))
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2014, 2017 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
||||
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
|
@ -166,17 +166,31 @@ identi.ca and status.net).")
|
|||
(define-public hexchat
|
||||
(package
|
||||
(name "hexchat")
|
||||
(version "2.12.2")
|
||||
(version "2.12.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://dl.hexchat.net/hexchat/hexchat-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xnclfbrgbkqndxygi5f27q00jd7yy54jbd1061jmhxa6wzpibbd"))))
|
||||
"0ficrx56knz5y297qb0x5y02339yvyv734z7kpcx1ixvb0qr2dgs"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Delete dangling symlinks to a non-existent ‘/usr’.
|
||||
(with-directory-excursion "m4"
|
||||
(for-each (lambda (f) (delete-file f))
|
||||
'("intltool.m4" "libtool.m4" "lt~obsolete.m4"
|
||||
"ltoptions.m4" "ltsugar.m4" "ltversion.m4")))
|
||||
(delete-file-recursively "build-aux")
|
||||
(delete-file "po/Makefile.in.in")))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("pkg-config" ,pkg-config)
|
||||
("intltool" ,intltool)))
|
||||
(native-inputs `(("autoconf" ,autoconf)
|
||||
("autoconf-archive" ,autoconf-archive)
|
||||
("automake" ,automake)
|
||||
("intltool" ,intltool)
|
||||
("libtool" ,libtool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs `(("dbus-glib" ,dbus-glib)
|
||||
("dbus" ,dbus)
|
||||
("enchant" ,enchant)
|
||||
|
@ -190,6 +204,17 @@ identi.ca and status.net).")
|
|||
("luajit" ,luajit)
|
||||
("perl-xml-parser" ,perl-xml-parser)
|
||||
("python-2" ,python-2)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; Release 2.12.4 wasn't properly bootstrapped. Later ones might be!
|
||||
(add-after 'unpack 'bootstrap
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; This file is still required for autoreconf.
|
||||
(copy-file (string-append (assoc-ref inputs "intltool")
|
||||
"/share/intltool/Makefile.in.in")
|
||||
"po/Makefile.in.in")
|
||||
(zero? (system* "autoreconf" "-fiv")))))))
|
||||
(synopsis "Graphical IRC Client")
|
||||
(description
|
||||
"HexChat lets you connect to multiple IRC networks at once. The main
|
||||
|
@ -1001,7 +1026,7 @@ for @uref{https://torproject.org,tor} router) and many more.")
|
|||
(synopsis "Perl implementation of PSYC protocol")
|
||||
(home-page "http://perlpsyc.psyc.eu/")
|
||||
(license (list license:gpl2
|
||||
(package-license perl)
|
||||
license:perl-license
|
||||
;; contrib/irssi-psyc.pl:
|
||||
license:public-domain
|
||||
;; bin/psycplay states AGPL with no version:
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
|
||||
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
|
||||
;;;
|
||||
|
@ -41,7 +41,7 @@
|
|||
(define-public hwloc
|
||||
(package
|
||||
(name "hwloc")
|
||||
(version "1.11.2")
|
||||
(version "1.11.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.open-mpi.org/software/hwloc/v"
|
||||
|
@ -49,7 +49,7 @@
|
|||
"/downloads/hwloc-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1y7c3ysiin0rw0sj6dbxkvjg92j4by36rykvf0vmh91q2rmrn0lc"))))
|
||||
"0acph1mf7588hfx8ds26ncr6nw5fd9x92adm11fwin7f93i10sdb"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libx11" ,libx11)
|
||||
|
|
|
@ -582,6 +582,50 @@ for path in [path for path in sys.path if 'site-packages' in path]: site.addsite
|
|||
interface. It is implemented as a frontend to @code{klick}.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public libgme
|
||||
(package
|
||||
(name "libgme")
|
||||
(version "0.6.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://bitbucket.org/mpyne/game-music-emu/"
|
||||
"downloads/game-music-emu-" version
|
||||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ; no check target
|
||||
(home-page "https://bitbucket.org/mpyne/game-music-emu")
|
||||
(synopsis "Video game music file playback library")
|
||||
(description
|
||||
"Game-music-emu is a collection of video game music file emulators that
|
||||
support the following formats and systems:
|
||||
@table @code
|
||||
@item AY
|
||||
ZX Spectrum/Asmtrad CPC
|
||||
@item GBS
|
||||
Nintendo Game Boy
|
||||
@item GYM
|
||||
Sega Genesis/Mega Drive
|
||||
@item HES
|
||||
NEC TurboGrafx-16/PC Engine
|
||||
@item KSS
|
||||
MSX Home Computer/other Z80 systems (doesn't support FM sound)
|
||||
@item NSF/NSFE
|
||||
Nintendo NES/Famicom (with VRC 6, Namco 106, and FME-7 sound)
|
||||
@item SAP
|
||||
Atari systems using POKEY sound chip
|
||||
@item SPC
|
||||
Super Nintendo/Super Famicom
|
||||
@item VGM/VGZ
|
||||
Sega Master System/Mark III, Sega Genesis/Mega Drive, BBC Micro
|
||||
@end table")
|
||||
(license (list license:lgpl2.1+
|
||||
;; demo and player directories are under the Expat license
|
||||
license:expat))))
|
||||
|
||||
(define-public lilypond
|
||||
(package
|
||||
(name "lilypond")
|
||||
|
@ -943,14 +987,14 @@ Editor. It is compatible with Power Tab Editor 1.7 and Guitar Pro.")
|
|||
(define-public jalv-select
|
||||
(package
|
||||
(name "jalv-select")
|
||||
(version "0.7")
|
||||
(version "0.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/brummer10/jalv_select/"
|
||||
"archive/V" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01y93l5c1f8za04a0y4b3v0nhsm1lhj6rny9xpdgd7jz6sl6w581"))))
|
||||
"0zraagwr681b5s3qifxf399c7q93jz23c8sr42gmff9zqnvxc75q"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
|
@ -961,7 +1005,7 @@ Editor. It is compatible with Power Tab Editor 1.7 and Guitar Pro.")
|
|||
(add-after 'unpack 'ignore-PATH
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "jalv.select.cpp"
|
||||
(("echo \\$PATH | tr ':' '\\\n' | xargs ls")
|
||||
(("echo \\$PATH.*tr ':'.*xargs ls")
|
||||
(string-append "ls -1 " (assoc-ref inputs "jalv") "/bin")))
|
||||
(substitute* "jalv.select.h"
|
||||
(("gtkmm.h") "gtkmm-2.4/gtkmm.h"))
|
||||
|
@ -983,7 +1027,7 @@ users to select LV2 plugins and run them with jalv.")
|
|||
(define-public synthv1
|
||||
(package
|
||||
(name "synthv1")
|
||||
(version "0.8.1")
|
||||
(version "0.8.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -991,7 +1035,7 @@ users to select LV2 plugins and run them with jalv.")
|
|||
"/synthv1-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0rzkr8mgy28j5kg56qqrdm05ml2wlm651yk27c2mn5ql7v92gdx3"))))
|
||||
"0lmblhk0728bxi7cixc2j9p6gisicy6alybga9vwmg453snrsybr"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; There are no tests.
|
||||
|
@ -1014,7 +1058,7 @@ oscillators and stereo effects.")
|
|||
(define-public drumkv1
|
||||
(package
|
||||
(name "drumkv1")
|
||||
(version "0.8.1")
|
||||
(version "0.8.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -1022,7 +1066,7 @@ oscillators and stereo effects.")
|
|||
"/drumkv1-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0l6kjb1q9vslwy56836a0c65mf8z8ycam5vzz3k4qvd8g74bs1zq"))))
|
||||
"0lf9x99gmmk64xq73lcwpwqznh8s79qy2fjjjzzw6sbw99w8qyz4"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; There are no tests.
|
||||
|
@ -1048,7 +1092,7 @@ effects.")
|
|||
(define-public samplv1
|
||||
(package
|
||||
(name "samplv1")
|
||||
(version "0.8.1")
|
||||
(version "0.8.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -1056,7 +1100,7 @@ effects.")
|
|||
"/samplv1-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"15rp9d1jbb56idyrnn9cqi1i7a70z1a1qdyz7ryn0bla0ghjnich"))))
|
||||
"11mxn3ff9g0x1rl4jl5rngmwlb8dmkbzsjhxb8gqhmlpfj24wl7l"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; There are no tests.
|
||||
|
@ -1866,7 +1910,7 @@ and hold, etc.")
|
|||
(define-public gxtuner
|
||||
(package
|
||||
(name "gxtuner")
|
||||
(version "2.3")
|
||||
(version "2.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/brummer10/gxtuner/"
|
||||
|
@ -1874,7 +1918,7 @@ and hold, etc.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1abpxiydn4c9wssz6895hnad9ipkcy3rkgzbnanvwb46nm44x6if"))))
|
||||
"1hn5qjac7qd00v0sp7ijhhc3sb26ks9bni06nngivva21h61xrjr"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
|
@ -1886,7 +1930,7 @@ and hold, etc.")
|
|||
(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(inputs
|
||||
`(("gtk+" ,gtk+-2)
|
||||
`(("gtk+" ,gtk+)
|
||||
("jack" ,jack-1)
|
||||
("fftwf" ,fftwf)
|
||||
("cairo" ,cairo)
|
||||
|
|
|
@ -29,15 +29,15 @@
|
|||
(define-public nano
|
||||
(package
|
||||
(name "nano")
|
||||
(version "2.8.1")
|
||||
(version "2.8.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/nano/nano-"
|
||||
version ".tar.gz"))
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"042rbhhkiw6nvwklm8zmmdlhjr8gdhdp486hafwrn1pwnpd511m4"))))
|
||||
"1q5rxkvsv974085xrd2k11ffazadabcb9cnpfra0shmj71xqlgh2"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
|
|
|
@ -252,7 +252,7 @@ curses widgets, such as dialog boxes.")
|
|||
(description
|
||||
"@code{Curses} is the interface between Perl and the curses library
|
||||
of your system.")
|
||||
(license (package-license perl))))
|
||||
(license perl-license)))
|
||||
|
||||
(define-public stfl
|
||||
(package
|
||||
|
|
|
@ -727,8 +727,7 @@ definitions and structure manipulators for Perl.")
|
|||
(base32
|
||||
"1v3nl2kaj4fs55n1617n53q8sa3mir06898vpy1rq98zjih24h4d"))
|
||||
(patches
|
||||
(search-patches
|
||||
"perl-net-dns-resolver-programmable-Fix-broken-interface.patch"))))
|
||||
(search-patches "perl-net-dns-resolver-programmable-fix.patch"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-module-build" ,perl-module-build)))
|
||||
|
@ -739,7 +738,7 @@ definitions and structure manipulators for Perl.")
|
|||
"Programmable DNS resolver class for offline emulation of DNS")
|
||||
(description "Net::DNS::Resolver::Programmable is a programmable DNS resolver for
|
||||
offline emulation of DNS.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-netaddr-ip
|
||||
(package
|
||||
|
@ -772,7 +771,7 @@ offline emulation of DNS.")
|
|||
(synopsis
|
||||
"Manages IPv4 and IPv6 addresses and subnets")
|
||||
(description "NetAddr::IP manages IPv4 and IPv6 addresses and subsets.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-net-patricia
|
||||
(package
|
||||
|
@ -846,7 +845,7 @@ offline emulation of DNS.")
|
|||
"Look up location and network information by IP Address in Perl")
|
||||
(description "The Perl module 'Geo::IP'. It looks up location and network
|
||||
information by IP Address.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public perl-io-socket-inet6
|
||||
(package
|
||||
|
@ -876,7 +875,7 @@ information by IP Address.")
|
|||
"Perl object interface for AF_INET/AF_INET6 domain sockets")
|
||||
(description "IO::Socket::INET6 is an interface for AF_INET/AF_INET6 domain
|
||||
sockets in Perl.")
|
||||
(license (package-license perl))))
|
||||
(license license:perl-license)))
|
||||
|
||||
(define-public proxychains-ng
|
||||
(package
|
||||
|
@ -1143,7 +1142,7 @@ networks.")
|
|||
(define-public speedtest-cli
|
||||
(package
|
||||
(name "speedtest-cli")
|
||||
(version "1.0.5")
|
||||
(version "1.0.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1152,7 +1151,7 @@ networks.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0y1888492kl21dz69vd526189c5aal3q790jawdb2wph42cz0cq8"))))
|
||||
"1alambi1ljng6j04k7pq58jqwd0wh1q9630f17nl34ljabji5lwy"))))
|
||||
(build-system python-build-system)
|
||||
(home-page "https://github.com/sivel/speedtest-cli")
|
||||
(synopsis "Internet bandwidth tester")
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -20,7 +21,6 @@
|
|||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages gsasl)
|
||||
#:use-module (gnu packages libevent)
|
||||
#:use-module (gnu packages kerberos)
|
||||
#:use-module (gnu packages onc-rpc)
|
||||
|
@ -41,7 +41,7 @@
|
|||
(define-public nfs-utils
|
||||
(package
|
||||
(name "nfs-utils")
|
||||
(version "1.3.4")
|
||||
(version "2.1.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -49,7 +49,7 @@
|
|||
"/nfs-utils-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xarqhwy757vazv9gqhyrgxsrx083yhvkkih01jh83fqm305naml"))))
|
||||
"1vqrqzhg9nh2wj1icp7k8v9dibgnn521b45np79nnkmqf16bbbhg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -57,9 +57,9 @@
|
|||
,(string-append "--with-start-statd="
|
||||
(assoc-ref %outputs "out") "/sbin/start-statd")
|
||||
,(string-append "--with-krb5=" (assoc-ref %build-inputs "mit-krb5")))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before
|
||||
'configure 'adjust-command-file-names
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'adjust-command-file-names
|
||||
(lambda _
|
||||
;; Remove assumptions of FHS from start-statd script
|
||||
(substitute* `("utils/statd/start-statd")
|
||||
|
@ -98,7 +98,6 @@
|
|||
("libnfsidmap" ,libnfsidmap)
|
||||
("sqlite" ,sqlite)
|
||||
("lvm2" ,lvm2)
|
||||
("gss" ,gss)
|
||||
("util-linux" ,util-linux)
|
||||
("mit-krb5" ,mit-krb5)
|
||||
("libtirpc" ,libtirpc)))
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -37,7 +38,6 @@
|
|||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages libevent)
|
||||
#:use-module (gnu packages lynx)
|
||||
#:use-module (gnu packages m4)
|
||||
#:use-module (gnu packages multiprecision)
|
||||
#:use-module (gnu packages ncurses)
|
||||
|
@ -50,6 +50,7 @@
|
|||
#:use-module (gnu packages time)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages version-control)
|
||||
#:use-module (gnu packages web-browsers)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (guix build-system gnu)
|
||||
|
@ -58,7 +59,8 @@
|
|||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix svn-download)
|
||||
#:use-module (guix utils))
|
||||
#:use-module (guix utils)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
;; A shortcut for files from ocaml forge. Downloaded files are computed from
|
||||
;; their number, not their name.
|
||||
|
@ -212,6 +214,36 @@ functional, imperative and object-oriented styles of programming.")
|
|||
;; distributed under lgpl2.0.
|
||||
(license (list license:qpl license:lgpl2.0))))
|
||||
|
||||
(define-public ocaml-4.01
|
||||
(package
|
||||
(inherit ocaml)
|
||||
(version "4.01.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://caml.inria.fr/pub/distrib/ocaml-"
|
||||
(version-major+minor version)
|
||||
"/ocaml-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03d7ida94s1gpr3gadf4jyhmh5rrszd5s4m4z59daaib25rvfyv7"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments ocaml)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(replace 'build
|
||||
(lambda _
|
||||
;; Specifying '-j' at all causes the build to fail.
|
||||
(zero? (system* "make" "world.opt"))))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(with-directory-excursion "testsuite"
|
||||
(zero? (system*
|
||||
"make"
|
||||
"all"
|
||||
(string-append
|
||||
"TOPDIR=" (getcwd) "/.."))))))))))))
|
||||
|
||||
(define-public opam
|
||||
(package
|
||||
(name "opam")
|
||||
|
@ -807,6 +839,14 @@ compilation and linkage, there are new frontends of the various OCaml
|
|||
compilers that can directly deal with packages.")
|
||||
(license license:x11)))
|
||||
|
||||
(define-public ocaml4.01-findlib
|
||||
(package
|
||||
(inherit ocaml-findlib)
|
||||
(name "ocaml4.01-findlib")
|
||||
(native-inputs
|
||||
`(("m4" ,m4)
|
||||
("ocaml" ,ocaml-4.01)))))
|
||||
|
||||
;; note that some tests may hang for no obvious reason.
|
||||
(define-public ocaml-ounit
|
||||
(package
|
||||
|
@ -832,6 +872,9 @@ compilers that can directly deal with packages.")
|
|||
other XUnit testing frameworks.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ocaml4.01-ounit
|
||||
(package-with-ocaml4.01 ocaml-ounit))
|
||||
|
||||
(define-public camlzip
|
||||
(package
|
||||
(name "camlzip")
|
||||
|
@ -874,6 +917,24 @@ JAR format. It provides functions for reading from and writing to compressed
|
|||
files in these formats.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public ocaml4.01-camlzip
|
||||
(let ((base (package-with-ocaml4.01 camlzip)))
|
||||
(package
|
||||
(inherit base)
|
||||
(name "ocaml4.01-camlzip")
|
||||
;; Version 1.05 is the last version to support OCaml 4.01.0.
|
||||
(version "1.05")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append
|
||||
"http://forge.ocamlcore.org/frs/download.php/1037/camlzip-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0syh72jk9s0qwjmmfrkqchaj98m020ii082jn38pwnmb6v3p02wk")))))))
|
||||
|
||||
(define-public ocamlmod
|
||||
(package
|
||||
(name "ocamlmod")
|
||||
|
@ -1024,6 +1085,9 @@ qcheck library. The possibilities range from trivial tests -- extremely simple
|
|||
to use -- to sophisticated random generation of test cases.")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public ocaml4.01-qtest
|
||||
(package-with-ocaml4.01 ocaml-qtest))
|
||||
|
||||
(define-public ocaml-stringext
|
||||
(package
|
||||
(name "ocaml-stringext")
|
||||
|
@ -1087,8 +1151,22 @@ a camlp4-based tool that allows to instrument your application before running
|
|||
tests. After application execution, it is possible to generate a report in HTML
|
||||
format that is the replica of the application source code annotated with code
|
||||
coverage information.")
|
||||
(properties `((ocaml4.01-variant . ,(delay ocaml4.01-bisect))))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public ocaml4.01-bisect
|
||||
(let ((base (package-with-ocaml4.01 (strip-ocaml4.01-variant ocaml-bisect))))
|
||||
(package
|
||||
(inherit base)
|
||||
(arguments
|
||||
`(#:ocaml ,ocaml-4.01
|
||||
;; Camlp4 is included with OCaml 4.01, so do not include it as a
|
||||
;; separate input.
|
||||
,@(strip-keyword-arguments '(#:make-flags) (package-arguments base))))
|
||||
(native-inputs `(,@(alist-delete "camlp4" (package-native-inputs base))))
|
||||
(propagated-inputs
|
||||
`(,@(alist-delete "camlp4" (package-propagated-inputs base)))))))
|
||||
|
||||
(define-public ocaml-bitstring
|
||||
(package
|
||||
(name "ocaml-bitstring")
|
||||
|
@ -1267,6 +1345,9 @@ coexistence with the old (version 2) SQLite and its OCaml wrapper
|
|||
@code{ocaml-sqlite}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ocaml4.01-sqlite3
|
||||
(package-with-ocaml4.01 ocaml-sqlite3))
|
||||
|
||||
(define-public ocaml-csv
|
||||
(package
|
||||
(name "ocaml-csv")
|
||||
|
@ -1291,6 +1372,9 @@ read and write files in this format as well as some convenience functions to
|
|||
manipulate such data.")
|
||||
(license (package-license camlp4))))
|
||||
|
||||
(define-public ocaml4.01-csv
|
||||
(package-with-ocaml4.01 ocaml-csv))
|
||||
|
||||
(define-public ocaml-mtime
|
||||
(package
|
||||
(name "ocaml-mtime")
|
||||
|
@ -1680,6 +1764,9 @@ format. It can process XML documents without a complete in-memory
|
|||
representation of the data.")
|
||||
(license license:isc)))
|
||||
|
||||
(define-public ocaml4.01-xmlm
|
||||
(package-with-ocaml4.01 ocaml-xmlm))
|
||||
|
||||
(define-public ocaml-ulex
|
||||
(package
|
||||
(name "ocaml-ulex")
|
||||
|
@ -1945,6 +2032,9 @@ every compliant installation of OCaml and organize these libraries into a
|
|||
hierarchy of modules.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public ocaml4.01-batteries
|
||||
(package-with-ocaml4.01 ocaml-batteries))
|
||||
|
||||
(define-public ocaml-pcre
|
||||
(package
|
||||
(name "ocaml-pcre")
|
||||
|
|
|
@ -28,14 +28,14 @@
|
|||
(define-public ocrad
|
||||
(package
|
||||
(name "ocrad")
|
||||
(version "0.25")
|
||||
(version "0.26")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/ocrad/ocrad-"
|
||||
version ".tar.lz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1m2dblgvvjs48rsglfdwq0ib9zk8h9n34xsh67ibrg0g0ffbw477"))))
|
||||
"0g4fq7maybdnd1471kd05a3f5sb7spa3d26k706rk85sd5wd70y3"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("lzip" ,lzip)))
|
||||
(home-page "https://www.gnu.org/software/ocrad/")
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -21,6 +22,7 @@
|
|||
#:use-module (guix licenses)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages kerberos)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (guix build-system gnu))
|
||||
|
@ -28,15 +30,16 @@
|
|||
(define-public libtirpc
|
||||
(package
|
||||
(name "libtirpc")
|
||||
(version "0.2.4")
|
||||
(version "1.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/libtirpc/libtirpc/"
|
||||
version "/libtirpc-"
|
||||
version ".tar.bz2"))
|
||||
(patches (search-patches "libtirpc-CVE-2017-8779.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"18a337wa4amf0k21wnimp3yzs5l3cxqndz4x3x8bm993zhfy5hs5"))))
|
||||
"17mqrdgsgp9m92pmq7bvr119svdg753prqqxmg4cnz5y657rfmji"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -66,16 +69,17 @@ IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).")
|
|||
(define-public rpcbind
|
||||
(package
|
||||
(name "rpcbind")
|
||||
(version "0.2.3")
|
||||
(version "0.2.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/" name "/" name "/"
|
||||
version "/"
|
||||
name "-" version ".tar.bz2"))
|
||||
(patches (search-patches "rpcbind-CVE-2017-8779.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq"))))
|
||||
"0rjc867mdacag4yqvs827wqhkh27135rp9asj06ixhf71m9rljh7"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
@ -68,17 +68,30 @@
|
|||
arch "-linux"
|
||||
"/20131110/guile-2.0.9.tar.xz"))))
|
||||
|
||||
(define-public guix-0.12.0
|
||||
(define-public guix
|
||||
;; Latest version of Guix, which may or may not correspond to a release.
|
||||
;; Note: the 'update-guix-package.scm' script expects this definition to
|
||||
;; start precisely like this.
|
||||
(let ((version "0.12.0")
|
||||
(commit "ba2260dbbc5a3c915e2cbd54d93f2f3af2a864c3")
|
||||
(revision 10))
|
||||
(package
|
||||
(name "guix")
|
||||
(version "0.12.0")
|
||||
|
||||
(version (if (zero? revision)
|
||||
version
|
||||
(string-append version "-"
|
||||
(number->string revision)
|
||||
"." (string-take commit 7))))
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://alpha.gnu.org/gnu/guix/guix-"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.savannah.gnu.org/r/guix.git")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"1jgy5mlygmhxdqhrp6vr8w83ndcm5mk64xfravr8l2d7hq8y40b2"))))
|
||||
"0nkwbblsnl7kv2n8jf8c6rl3a7dynaqxizhhni18vbnmvza35c79"))
|
||||
(file-name (string-append "guix-" version "-checkout"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list
|
||||
|
@ -89,7 +102,18 @@
|
|||
"/etc/bash_completion.d")
|
||||
(string-append "--with-libgcrypt-prefix="
|
||||
(assoc-ref %build-inputs
|
||||
"libgcrypt")))
|
||||
"libgcrypt"))
|
||||
|
||||
;; Set 'DOT_USER_PROGRAM' to the empty string so
|
||||
;; we don't keep a reference to Graphviz, whose
|
||||
;; closure is pretty big (too big for the GuixSD
|
||||
;; installation image.)
|
||||
"ac_cv_path_DOT_USER_PROGRAM=dot"
|
||||
|
||||
;; To avoid problems with the length of shebangs,
|
||||
;; choose a fixed-width and short directory name
|
||||
;; for tests.
|
||||
"ac_cv_guix_test_root=/tmp/guix-tests")
|
||||
#:parallel-tests? #f ;work around <http://bugs.gnu.org/21097>
|
||||
|
||||
#:modules ((guix build gnu-build-system)
|
||||
|
@ -98,6 +122,14 @@
|
|||
(ice-9 rdelim))
|
||||
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'bootstrap
|
||||
(lambda _
|
||||
;; Make sure 'msgmerge' can modify the PO files.
|
||||
(for-each (lambda (po)
|
||||
(chmod po #o666))
|
||||
(find-files "." "\\.po$"))
|
||||
|
||||
(zero? (system* "sh" "bootstrap"))))
|
||||
(add-before
|
||||
'configure 'copy-bootstrap-guile
|
||||
(lambda* (#:key system inputs #:allow-other-keys)
|
||||
|
@ -192,7 +224,7 @@
|
|||
|
||||
("sqlite" ,sqlite)
|
||||
("libgcrypt" ,libgcrypt)
|
||||
("guile" ,guile-2.0)
|
||||
("guile" ,guile-2.2)
|
||||
|
||||
("boot-guile/i686"
|
||||
,(boot-guile "i686"
|
||||
|
@ -215,7 +247,7 @@
|
|||
(base32
|
||||
"1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r"))))))
|
||||
(propagated-inputs
|
||||
`(("gnutls" ,gnutls) ;for 'guix download' & co.
|
||||
`(("gnutls" ,gnutls/guile-2.2) ;for 'guix download' & co.
|
||||
("guile-json" ,guile-json)
|
||||
("guile-ssh" ,guile-ssh)))
|
||||
|
||||
|
@ -228,47 +260,10 @@ the usual package management features, it also supports transactional
|
|||
upgrades and roll-backs, per-user profiles, and much more. It is based on
|
||||
the Nix package manager.")
|
||||
(license gpl3+)
|
||||
(properties '((ftp-server . "alpha.gnu.org")))))
|
||||
(properties '((ftp-server . "alpha.gnu.org"))))))
|
||||
|
||||
(define guix-devel
|
||||
;; Development version of Guix.
|
||||
;;
|
||||
;; Note: use a very short commit id; with a longer one, the limit on
|
||||
;; hash-bang lines would be exceeded while running the tests.
|
||||
(let ((commit "25a49294caf2386e65fc1b12a2508324be0b1cc2"))
|
||||
(package (inherit guix-0.12.0)
|
||||
(version (string-append "0.12.0-9." (string-take commit 4)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
;; "git://git.sv.gnu.org/guix.git" temporarily
|
||||
;; unavailable (XXX).
|
||||
(url "http://git.savannah.gnu.org/r/guix.git")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"0p4rh0629j89v4ka5dsp70a1xrfhg7sxjjq54p68vw7x5dkann4a"))
|
||||
(file-name (string-append "guix-" version "-checkout"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments guix-0.12.0)
|
||||
((#:configure-flags flags)
|
||||
;; Set 'DOT_USER_PROGRAM' to the empty string so we don't keep a
|
||||
;; reference to Graphviz, whose closure is pretty big (too big for
|
||||
;; the GuixSD installation image.)
|
||||
`(cons "ac_cv_path_DOT_USER_PROGRAM=dot" ,flags))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after
|
||||
'unpack 'bootstrap
|
||||
(lambda _
|
||||
;; Make sure 'msgmerge' can modify the PO files.
|
||||
(for-each (lambda (po)
|
||||
(chmod po #o666))
|
||||
(find-files "." "\\.po$"))
|
||||
|
||||
(zero? (system* "sh" "bootstrap")))))))))))
|
||||
|
||||
(define-public guix guix-devel)
|
||||
;; Alias for backward compatibility.
|
||||
(define-public guix-devel guix)
|
||||
|
||||
(define (source-file? file stat)
|
||||
"Return true if FILE is likely a source file, false if it is a typical
|
||||
|
@ -310,14 +305,14 @@ out) and returning a package that uses that as its 'source'."
|
|||
(define-public nix
|
||||
(package
|
||||
(name "nix")
|
||||
(version "1.11.6")
|
||||
(version "1.11.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://nixos.org/releases/nix/nix-"
|
||||
version "/nix-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"18xjg7cfvqzhsmvir6xmw95jxvl2w7icphbbll462xbnj9ddaag7"))))
|
||||
"1qg7qrfr60dysmyfg3ijgani71l23p1kqadhjs8kz11pgwkkx50f"))))
|
||||
(build-system gnu-build-system)
|
||||
;; XXX: Should we pass '--with-store-dir=/gnu/store'? But then we'd also
|
||||
;; need '--localstatedir=/var'. But then! The thing would use /var/nix
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
(define-public parallel
|
||||
(package
|
||||
(name "parallel")
|
||||
(version "20170322")
|
||||
(version "20170422")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -53,7 +53,7 @@
|
|||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xjk6np0gwa6p5j26camwybx1n0vqz0f0bksi593rgw800211y7q"))))
|
||||
"0afk1q8mqzz02h6imyykgi9gwk5gj08hzs6lwgd65ilj4slkh93s"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -197,8 +197,9 @@ passwords that could be guessed by crack by filtering them out, at source.")
|
|||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list
|
||||
(string-append "https://fedorahosted.org/releases/l/i/"
|
||||
name "/" name "-" version ".tar.bz2")
|
||||
(string-append "https://github.com/" name "/" name
|
||||
"/releases/download/" name "-" version
|
||||
"/" name "-" version ".tar.bz2")
|
||||
(string-append "https://launchpad.net/libpwquality/trunk/"
|
||||
version "/+download/"
|
||||
name "-" version ".tar.bz2")))
|
||||
|
@ -212,7 +213,7 @@ passwords that could be guessed by crack by filtering them out, at source.")
|
|||
(inputs
|
||||
`(("cracklib" ,cracklib)))
|
||||
(synopsis "Password quality checker")
|
||||
(home-page "https://fedorahosted.org/libpwquality/")
|
||||
(home-page "https://github.com/libpwquality/libpwquality")
|
||||
(description
|
||||
"Libpwquality is a library for password quality checking and generation of
|
||||
random passwords that pass the checks.")
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue